src/gui: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support

Also - Make winPeekMessage() & winPostMessage() obsolete
     - FlashWindowEx, IsValidLanguageGroup functions no longer resolved
       dynamically (available on >= Windows 2000)
     - LoadIcon/LoadCursor -> LoadImage w/LR_SHARED for system
       icons/cursors
     - qsystemtrayicon_win: use Shell_NotifyIconGetRect if available
       (Windows 7)

Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>

15 files changed, 389 insertions, 815 deletions

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 05d9b3c268..15ddce8469 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -863,12 +863,6 @@ void QApplicationPrivate::initialize()
     if (qgetenv("QT_USE_NATIVE_WINDOWS").toInt() > 0)
         q->setAttribute(Qt::AA_NativeWindows);
 
-#if defined(Q_WS_WIN)
-    // Alien is not currently working on Windows 98
-    if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based)
-        q->setAttribute(Qt::AA_NativeWindows);
-#endif
-
 #ifdef Q_WS_WINCE
 #ifdef QT_AUTO_MAXIMIZE_THRESHOLD
     autoMaximizeThreshold = QT_AUTO_MAXIMIZE_THRESHOLD;
@@ -4414,13 +4408,13 @@ HRESULT qt_CoCreateGuid(GUID* guid)
 {
     // We will use the following information to create the GUID
     // 1. absolute path to application
-    wchar_t tempFilename[512];
-    if (!GetModuleFileNameW(0, tempFilename, 512))
+    wchar_t tempFilename[MAX_PATH];
+    if (!GetModuleFileName(0, tempFilename, MAX_PATH))
         return S_FALSE;
-    unsigned int hash = qHash(QString::fromUtf16((const unsigned short *) tempFilename));
+    unsigned int hash = qHash(QString::fromWCharArray(tempFilename));
     guid->Data1 = hash;
     // 2. creation time of file
-    QFileInfo info(QString::fromUtf16((const unsigned short *) tempFilename));
+    QFileInfo info(QString::fromWCharArray(tempFilename));
     guid->Data2 = qHash(info.created().toTime_t());
     // 3. current system time
     guid->Data3 = qHash(QDateTime::currentDateTime().toTime_t());
@@ -4454,10 +4448,10 @@ QSessionManager::QSessionManager(QApplication * app, QString &id, QString &key)
     GUID guid;
     CoCreateGuid(&guid);
     StringFromGUID2(guid, guidstr, 40);
-    id = QString::fromUtf16((ushort*)guidstr);
+    id = QString::fromWCharArray(guidstr);
     CoCreateGuid(&guid);
     StringFromGUID2(guid, guidstr, 40);
-    key = QString::fromUtf16((ushort*)guidstr);
+    key = QString::fromWCharArray(guidstr);
 #endif
     d->sessionId = id;
     d->sessionKey = key;
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index bb7d9314c3..e1af0f7b9c 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -145,24 +145,6 @@ typedef struct tagTOUCHINPUT
 
 #endif
 
-#ifndef FLASHW_STOP
-typedef struct {
-    UINT  cbSize;
-    HWND  hwnd;
-    DWORD dwFlags;
-    UINT  uCount;
-    DWORD dwTimeout;
-} FLASHWINFO, *PFLASHWINFO;
-#define FLASHW_STOP         0
-#define FLASHW_CAPTION      0x00000001
-#define FLASHW_TRAY         0x00000002
-#define FLASHW_ALL          (FLASHW_CAPTION | FLASHW_TRAY)
-#define FLASHW_TIMER        0x00000004
-#define FLASHW_TIMERNOFG    0x0000000C
-#endif /* FLASHW_STOP */
-typedef BOOL (WINAPI *PtrFlashWindowEx)(PFLASHWINFO pfwi);
-static PtrFlashWindowEx pFlashWindowEx = 0;
-
 #include <windowsx.h>
 #include <limits.h>
 #include <string.h>
@@ -272,10 +254,6 @@ QTabletDeviceData currentTabletPointer;
 // from qregion_win.cpp
 extern HRGN qt_tryCreateRegion(QRegion::RegionType type, int left, int top, int right, int bottom);
 
-Q_CORE_EXPORT bool winPeekMessage(MSG* msg, HWND hWnd, UINT wMsgFilterMin,
-                            UINT wMsgFilterMax, UINT wRemoveMsg);
-Q_CORE_EXPORT bool winPostMessage(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
-
 // support for on-the-fly changes of the XP theme engine
 #ifndef WM_THEMECHANGED
 #define WM_THEMECHANGED                 0x031A
@@ -302,7 +280,7 @@ Q_CORE_EXPORT bool winPostMessage(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 #define GET_KEYSTATE_WPARAM(wParam)     (LOWORD(wParam))
 #endif
 
-// support for multi-media-keys on ME/2000/XP
+// support for multi-media-keys
 #ifndef WM_APPCOMMAND
 #define WM_APPCOMMAND                   0x0319
 
@@ -375,8 +353,6 @@ Q_CORE_EXPORT bool winPostMessage(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 
 #endif // WM_APPCOMMAND
 
-static UINT WM95_MOUSEWHEEL = 0;
-
 #if (_WIN32_WINNT < 0x0400)
 // This struct is defined in winuser.h if the _WIN32_WINNT >= 0x0400 -- in the
 // other cases we have to define it on our own.
@@ -543,14 +519,13 @@ static void qt_set_windows_color_resources()
     pal.setColor(QPalette::Inactive, QPalette::Light, pal.light().color());
     pal.setColor(QPalette::Inactive, QPalette::Dark, pal.dark().color());
 
-    if (QSysInfo::WindowsVersion != QSysInfo::WV_NT && QSysInfo::WindowsVersion != QSysInfo::WV_95) {
-        if (pal.midlight() == pal.button())
-            pal.setColor(QPalette::Midlight, pal.button().color().lighter(110));
-        if (pal.background() != pal.base()) {
-            pal.setColor(QPalette::Inactive, QPalette::Highlight, pal.color(QPalette::Inactive, QPalette::Window));
-            pal.setColor(QPalette::Inactive, QPalette::HighlightedText, pal.color(QPalette::Inactive, QPalette::Text));
-        }
+    if (pal.midlight() == pal.button())
+        pal.setColor(QPalette::Midlight, pal.button().color().lighter(110));
+    if (pal.background() != pal.base()) {
+        pal.setColor(QPalette::Inactive, QPalette::Highlight, pal.color(QPalette::Inactive, QPalette::Window));
+        pal.setColor(QPalette::Inactive, QPalette::HighlightedText, pal.color(QPalette::Inactive, QPalette::Text));
     }
+
     const QColor bg = pal.background().color();
     const QColor fg = pal.foreground().color(), btn = pal.button().color();
     QColor disabled((fg.red()+btn.red())/2,(fg.green()+btn.green())/2,
@@ -601,35 +576,18 @@ static void qt_set_windows_color_resources()
 static void qt_set_windows_font_resources()
 {
 #ifndef Q_WS_WINCE
-    QFont menuFont;
-    QFont messageFont;
-    QFont statusFont;
-    QFont titleFont;
-    QFont iconTitleFont;
-    QT_WA({
-        NONCLIENTMETRICS ncm;
-        ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, lfMessageFont) + sizeof(LOGFONTW);
-        SystemParametersInfo(SPI_GETNONCLIENTMETRICS, ncm.cbSize , &ncm, 0);
-        menuFont = qt_LOGFONTtoQFont(ncm.lfMenuFont,true);
-        messageFont = qt_LOGFONTtoQFont(ncm.lfMessageFont,true);
-        statusFont = qt_LOGFONTtoQFont(ncm.lfStatusFont,true);
-        titleFont = qt_LOGFONTtoQFont(ncm.lfCaptionFont,true);
-        LOGFONTW lfIconTitleFont;
-        SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(lfIconTitleFont), &lfIconTitleFont, 0);
-        iconTitleFont = qt_LOGFONTtoQFont(lfIconTitleFont,true);
-    } , {
-        // A version
-        NONCLIENTMETRICSA ncm;
-        ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, lfMessageFont) + sizeof(LOGFONTA);
-        SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0);
-        menuFont = qt_LOGFONTtoQFont((LOGFONT&)ncm.lfMenuFont,true);
-        messageFont = qt_LOGFONTtoQFont((LOGFONT&)ncm.lfMessageFont,true);
-        statusFont = qt_LOGFONTtoQFont((LOGFONT&)ncm.lfStatusFont,true);
-        titleFont = qt_LOGFONTtoQFont((LOGFONT&)ncm.lfCaptionFont,true);
-        LOGFONTA lfIconTitleFont;
-        SystemParametersInfoA(SPI_GETICONTITLELOGFONT, sizeof(lfIconTitleFont), &lfIconTitleFont, 0);
-        iconTitleFont = qt_LOGFONTtoQFont((LOGFONT&)lfIconTitleFont,true);
-    });
+    NONCLIENTMETRICS ncm;
+    ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, lfMessageFont) + sizeof(LOGFONT);
+    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, ncm.cbSize , &ncm, 0);
+
+    QFont menuFont = qt_LOGFONTtoQFont(ncm.lfMenuFont, true);
+    QFont messageFont = qt_LOGFONTtoQFont(ncm.lfMessageFont, true);
+    QFont statusFont = qt_LOGFONTtoQFont(ncm.lfStatusFont, true);
+    QFont titleFont = qt_LOGFONTtoQFont(ncm.lfCaptionFont, true);
+
+    LOGFONT lfIconTitleFont;
+    SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(lfIconTitleFont), &lfIconTitleFont, 0);
+    QFont iconTitleFont = qt_LOGFONTtoQFont(lfIconTitleFont, true);
 
     QApplication::setFont(menuFont, "QMenu");
     QApplication::setFont(menuFont, "QMenuBar");
@@ -657,26 +615,13 @@ static void qt_set_windows_font_resources()
 
 static void qt_win_read_cleartype_settings()
 {
+    UINT result = 0;
 #ifdef Q_OS_WINCE
-     UINT result;
-     BOOL ok;
-     ok = SystemParametersInfo(SPI_GETFONTSMOOTHING, 0, &result, 0);
-     if (ok)
-         qt_cleartype_enabled = result;
+    if (SystemParametersInfo(SPI_GETFONTSMOOTHING, 0, &result, 0))
+        qt_cleartype_enabled = result;
 #else
-    QT_WA({
-        UINT result;
-        BOOL ok;
-        ok = SystemParametersInfoW(SPI_GETFONTSMOOTHINGTYPE, 0, &result, 0);
-        if (ok)
-            qt_cleartype_enabled = (result == FE_FONTSMOOTHINGCLEARTYPE);
-    }, {
-        UINT result;
-        BOOL ok;
-        ok = SystemParametersInfoA(SPI_GETFONTSMOOTHINGTYPE, 0, &result, 0);
-        if (ok)
-            qt_cleartype_enabled = (result == FE_FONTSMOOTHINGCLEARTYPE);
-    });
+    if (SystemParametersInfo(SPI_GETFONTSMOOTHINGTYPE, 0, &result, 0))
+        qt_cleartype_enabled = (result == FE_FONTSMOOTHINGCLEARTYPE);
 #endif
 }
 
@@ -694,10 +639,10 @@ void QApplicationPrivate::initializeWidgetPaletteHash()
     QPalette pal = *QApplicationPrivate::sys_pal;
     QColor menuCol(qt_colorref2qrgb(GetSysColor(COLOR_MENU)));
     QColor menuText(qt_colorref2qrgb(GetSysColor(COLOR_MENUTEXT)));
-    BOOL isFlat = 0;
+    BOOL isFlat = false;
     if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
         && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
-        SystemParametersInfo(0x1022 /*SPI_GETFLATMENU*/, 0, &isFlat, 0);
+        SystemParametersInfo(SPI_GETFLATMENU, 0, &isFlat, 0);
     QPalette menu(pal);
     // we might need a special color group for the menu.
     menu.setColor(QPalette::Active, QPalette::Button, menuCol);
@@ -712,8 +657,7 @@ void QApplicationPrivate::initializeWidgetPaletteHash()
                     QColor(qt_colorref2qrgb(GetSysColor(
                                             (QSysInfo::WindowsVersion >= QSysInfo::WV_XP
                                             && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)
-                                            && isFlat ? COLOR_MENUHILIGHT
-                                                        : COLOR_HIGHLIGHT))));
+                                            && isFlat ? COLOR_MENUHILIGHT : COLOR_HIGHLIGHT))));
     menu.setColor(QPalette::Disabled, QPalette::HighlightedText, disabled);
     menu.setColor(QPalette::Disabled, QPalette::Button,
                     menu.color(QPalette::Active, QPalette::Button));
@@ -729,10 +673,8 @@ void QApplicationPrivate::initializeWidgetPaletteHash()
                     menu.color(QPalette::Active, QPalette::Highlight));
     menu.setColor(QPalette::Inactive, QPalette::HighlightedText,
                     menu.color(QPalette::Active, QPalette::HighlightedText));
-
-    if (QSysInfo::WindowsVersion != QSysInfo::WV_NT && QSysInfo::WindowsVersion != QSysInfo::WV_95)
-        menu.setColor(QPalette::Inactive, QPalette::ButtonText,
-                        pal.color(QPalette::Inactive, QPalette::Dark));
+    menu.setColor(QPalette::Inactive, QPalette::ButtonText,
+                    pal.color(QPalette::Inactive, QPalette::Dark));
     QApplication::setPalette(menu, "QMenu");
 
     if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
@@ -749,15 +691,10 @@ void QApplicationPrivate::initializeWidgetPaletteHash()
   qt_init() - initializes Qt for Windows
  *****************************************************************************/
 
-typedef BOOL (WINAPI *PtrUpdateLayeredWindow)(HWND hwnd, HDC hdcDst, const POINT *pptDst,
-    const SIZE *psize, HDC hdcSrc, const POINT *pptSrc, COLORREF crKey,
-    const Q_BLENDFUNCTION *pblend, DWORD dwflags);
-
 typedef BOOL (WINAPI *PtrSetProcessDPIAware) (VOID);
-
-static PtrUpdateLayeredWindow ptrUpdateLayeredWindow = 0;
 static PtrSetProcessDPIAware ptrSetProcessDPIAware = 0;
-
+PtrUpdateLayeredWindow ptrUpdateLayeredWindow = 0;
+PtrUpdateLayeredWindowIndirect ptrUpdateLayeredWindowIndirect = 0;
 static BOOL WINAPI qt_updateLayeredWindowIndirect(HWND hwnd, const Q_UPDATELAYEREDWINDOWINFO *info)
 {
     return (*ptrUpdateLayeredWindow)(hwnd, info->hdcDst, info->pptDst, info->psize, info->hdcSrc,
@@ -822,46 +759,30 @@ void qt_init(QApplicationPrivate *priv, int)
 #endif
     qApp->setObjectName(priv->appName());
 
-#if !defined(Q_WS_WINCE)
     // default font
-    HFONT hfont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
-    QFont f(QLatin1String("MS Sans Serif"),8);
-    int result = 0;
-    QT_WA({
-            LOGFONT lf;
-            if (result = GetObject(hfont, sizeof(lf), &lf))
-                f = qt_LOGFONTtoQFont((LOGFONT&)lf,true);
-        } , {
-              LOGFONTA lf;
-              if (result = GetObjectA(hfont, sizeof(lf), &lf))
-                  f = qt_LOGFONTtoQFont((LOGFONT&)lf,true);
-          });
-    if (result
-        && QSysInfo::WindowsVersion >= QSysInfo::WV_2000
-        && QSysInfo::WindowsVersion <= QSysInfo::WV_NT_based
-        && f.family() == QLatin1String("MS Shell Dlg"))
-        f.setFamily(QLatin1String("MS Shell Dlg 2"));
-    QApplicationPrivate::setSystemFont(f);
-#else //Q_WS_WINCE
-        LOGFONT lf;
-        HGDIOBJ stockFont = GetStockObject(SYSTEM_FONT);
-        int result = 0;
-        result = GetObject(stockFont, sizeof(lf), &lf);
-        QFont font = qt_LOGFONTtoQFont(lf, true);
-        if (result)
-          QApplicationPrivate::setSystemFont(font);
-#endif //Q_WS_WINCE
+#ifndef Q_WS_WINCE
+    HGDIOBJ stockFont = GetStockObject(DEFAULT_GUI_FONT);
+#else
+    HGDIOBJ stockFont = GetStockObject(SYSTEM_FONT);
+#endif
+
+    LOGFONT lf;
+    GetObject(stockFont, sizeof(lf), &lf);
+    QFont systemFont = qt_LOGFONTtoQFont(lf, true);
+
+#ifndef Q_WS_WINCE
+    if (systemFont.family() == QLatin1String("MS Shell Dlg")) {
+        systemFont.setFamily(QLatin1String("MS Shell Dlg 2"));
+    }
+#endif
+
+    QApplicationPrivate::setSystemFont(systemFont);
 
     // QFont::locale_init();  ### Uncomment when it does something on Windows
 
     if (QApplication::desktopSettingsAware())
         qt_set_windows_resources();
 
-    QT_WA({
-        WM95_MOUSEWHEEL = RegisterWindowMessage(L"MSWHEEL_ROLLMSG");
-    } , {
-        WM95_MOUSEWHEEL = RegisterWindowMessageA("MSWHEEL_ROLLMSG");
-    });
     initWinTabFunctions();
     QApplicationPrivate::inputContext = new QWinInputContext(0);
 
@@ -963,7 +884,7 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
         if (w->inherits("QTipLabel") || w->inherits("QAlphaWidget")) {
             if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
                 && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)) {
-                style |= 0x00020000;                // CS_DROPSHADOW
+                style |= CS_DROPSHADOW;
             }
             cname = QLatin1String("QToolTip");
         } else {
@@ -981,7 +902,7 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
 #endif
         if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
             && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
-            style |= 0x00020000;                // CS_DROPSHADOW
+            style |= CS_DROPSHADOW;
         icon = false;
     } else {
         cname = QLatin1String("QWidget");
@@ -1001,10 +922,10 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
     // unique ID on WinCE to make sure we can
     // move the windows to the front when starting
     // a second instance.
-    wchar_t uniqueAppID[256];
-    GetModuleFileNameW(0, uniqueAppID, 255);
-    cname = QString::number(RegisterWindowMessageW(
-              (const wchar_t *) QString::fromUtf16((const ushort *)uniqueAppID).toLower().replace(QLatin1Char('\\'),
+    wchar_t uniqueAppID[MAX_PATH];
+    GetModuleFileName(0, uniqueAppID, MAX_PATH);
+    cname = QString::number(RegisterWindowMessage(
+              (const wchar_t *) QString::fromWCharArray(uniqueAppID).toLower().replace(QLatin1Char('\\'),
               QLatin1Char('_')).utf16()));
 #endif
 
@@ -1016,15 +937,9 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
     static int classExists = -1;
 
     if (classExists == -1) {
-        QT_WA({
-            WNDCLASS wcinfo;
-            classExists = GetClassInfo(qWinAppInst(), (TCHAR*)cname.utf16(), &wcinfo);
-            classExists = classExists && wcinfo.lpfnWndProc != QtWndProc;
-        }, {
-            WNDCLASSA wcinfo;
-            classExists = GetClassInfoA(qWinAppInst(), cname.toLatin1(), &wcinfo);
-            classExists = classExists && wcinfo.lpfnWndProc != QtWndProc;
-        });
+        WNDCLASS wcinfo;
+        classExists = GetClassInfo((HINSTANCE)qWinAppInst(), (wchar_t*)cname.utf16(), &wcinfo);
+        classExists = classExists && wcinfo.lpfnWndProc != QtWndProc;
     }
 
     if (classExists)
@@ -1033,69 +948,31 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
     if (winclassNames()->contains(cname))        // already registered in our list
         return cname;
 
-    ATOM atom;
+    WNDCLASS wc;
+    wc.style        = style;
+    wc.lpfnWndProc  = (WNDPROC)QtWndProc;
+    wc.cbClsExtra   = 0;
+    wc.cbWndExtra   = 0;
+    wc.hInstance    = qWinAppInst();
+    if (icon) {
+        wc.hIcon = (HICON)LoadImage(qWinAppInst(), L"IDI_ICON1", IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);
 #ifndef Q_WS_WINCE
-    HBRUSH bgBrush = (HBRUSH)GetSysColorBrush(COLOR_WINDOW);
-    QT_WA({
-        WNDCLASS wc;
-        wc.style        = style;
-        wc.lpfnWndProc        = (WNDPROC)QtWndProc;
-        wc.cbClsExtra        = 0;
-        wc.cbWndExtra        = 0;
-        wc.hInstance        = qWinAppInst();
-        if (icon) {
-            wc.hIcon = LoadIcon(qWinAppInst(), L"IDI_ICON1");
-            if (!wc.hIcon)
-                wc.hIcon = LoadIcon(0, IDI_APPLICATION);
-        } else {
-            wc.hIcon = 0;
-        }
-        wc.hCursor        = 0;
-        wc.hbrBackground= bgBrush;
-        wc.lpszMenuName        = 0;
-        wc.lpszClassName= (TCHAR*)cname.utf16();
-        atom = RegisterClass(&wc);
-    } , {
-        WNDCLASSA wc;
-        wc.style        = style;
-        wc.lpfnWndProc        = (WNDPROC)QtWndProc;
-        wc.cbClsExtra        = 0;
-        wc.cbWndExtra        = 0;
-        wc.hInstance        = qWinAppInst();
-        if (icon) {
-            wc.hIcon = LoadIconA(qWinAppInst(), (char*)"IDI_ICON1");
-            if (!wc.hIcon)
-                wc.hIcon = LoadIconA(0, (char*)IDI_APPLICATION);
-        } else {
-            wc.hIcon = 0;
-        }
-        wc.hCursor        = 0;
-        wc.hbrBackground= bgBrush;
-        wc.lpszMenuName        = 0;
-          QByteArray tempArray = cname.toLatin1();
-        wc.lpszClassName= tempArray;
-        atom = RegisterClassA(&wc);
-    });
+        if (!wc.hIcon)
+            wc.hIcon = (HICON)LoadImage(0, IDI_APPLICATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED);
+#endif
+    } else {
+        wc.hIcon    = 0;
+    }
+    wc.hCursor      = 0;
+#ifndef Q_WS_WINCE
+    wc.hbrBackground = (HBRUSH)GetSysColorBrush(COLOR_WINDOW);
 #else
-        WNDCLASS wc;
-        wc.style        = style;
-        wc.lpfnWndProc        = (WNDPROC)QtWndProc;
-        wc.cbClsExtra        = 0;
-        wc.cbWndExtra        = 0;
-        wc.hInstance        = qWinAppInst();
-        if (icon) {
-            wc.hIcon = LoadIcon(qWinAppInst(), L"IDI_ICON1");
-//            if (!wc.hIcon)
-//                wc.hIcon = LoadIcon(0, IDI_APPLICATION);
-        } else {
-            wc.hIcon = 0;
-        }
-        wc.hCursor        = 0;
-        wc.hbrBackground= 0;
-        wc.lpszMenuName        = 0;
-        wc.lpszClassName= (TCHAR*)cname.utf16();
-        atom = RegisterClass(&wc);
+    wc.hbrBackground = 0;
 #endif
+    wc.lpszMenuName  = 0;
+    wc.lpszClassName = (wchar_t*)cname.utf16();
+
+    ATOM atom = RegisterClass(&wc);
 
 #ifndef QT_NO_DEBUG
     if (!atom)
@@ -1117,11 +994,7 @@ static void unregWinClasses()
     WinClassNameHash *hash = winclassNames();
     QHash<QString, int>::ConstIterator it = hash->constBegin();
     while (it != hash->constEnd()) {
-        QT_WA({
-            UnregisterClass((TCHAR*)it.key().utf16(), qWinAppInst());
-        } , {
-            UnregisterClassA(it.key().toLatin1(), qWinAppInst());
-        });
+        UnregisterClass((wchar_t*)it.key().utf16(), qWinAppInst());
         ++it;
     }
     hash->clear();
@@ -1338,16 +1211,10 @@ void QApplication::beep()
 
 static void alert_widget(QWidget *widget, int duration)
 {
-    bool stopFlash = duration < 0;
-
-    if (!pFlashWindowEx) {
 #ifndef Q_OS_WINCE
-        QLibrary themeLib(QLatin1String("user32"));
-        pFlashWindowEx  = (PtrFlashWindowEx)themeLib.resolve("FlashWindowEx");
-#endif
-    }
+    bool stopFlash = duration < 0;
 
-    if (pFlashWindowEx && widget && (!widget->isActiveWindow() || stopFlash)) {
+    if (widget && (!widget->isActiveWindow() || stopFlash)) {
         DWORD timeOut = GetCaretBlinkTime();
         if (timeOut <= 0)
             timeOut = 250;
@@ -1365,8 +1232,9 @@ static void alert_widget(QWidget *widget, int duration)
         info.dwTimeout = stopFlash ? 0 : timeOut;
         info.uCount = stopFlash ? 0 : flashCount;
 
-        pFlashWindowEx(&info);
+        FlashWindowEx(&info);
     }
+#endif
 }
 
 void QApplication::alert(QWidget *widget, int duration)
@@ -1727,7 +1595,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             // Sometimes we only get a WM_MOUSEMOVE message
             // and sometimes we get both a WM_MOUSEMOVE and
             // a WM_LBUTTONDOWN/UP, this creates a spurious mouse
-            // press/release event, using the winPeekMessage
+            // press/release event, using the PeekMessage
             // will help us fix this.  This leaves us with a
             // question:
             //    This effectively kills using the mouse AND the
@@ -1737,16 +1605,14 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             bool is_mouse_move = (message == WM_MOUSEMOVE);
             if (is_mouse_move) {
                 MSG msg1;
-                if (winPeekMessage(&msg1, msg.hwnd, WM_MOUSEFIRST,
-                                    WM_MOUSELAST, PM_NOREMOVE))
+                if (PeekMessage(&msg1, msg.hwnd, WM_MOUSEFIRST,
+                                WM_MOUSELAST, PM_NOREMOVE))
                     next_is_button = (msg1.message == WM_LBUTTONUP
                                        || msg1.message == WM_LBUTTONDOWN);
             }
             if (!is_mouse_move || (is_mouse_move && !next_is_button))
                 qt_tabletChokeMouse = false;
         }
-    } else if (message == WM95_MOUSEWHEEL) {
-        result = widget->translateWheelEvent(msg);
     } else {
         switch (message) {
         case WM_TOUCH:
@@ -1777,7 +1643,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
         case WM_IME_KEYDOWN:
         case WM_CHAR: {
             MSG msg1;
-            bool anyMsg = winPeekMessage(&msg1, msg.hwnd, 0, 0, PM_NOREMOVE);
+            bool anyMsg = PeekMessage(&msg1, msg.hwnd, 0, 0, PM_NOREMOVE);
             if (anyMsg && msg1.message == WM_DEADCHAR) {
                 result = true; // consume event since there is a dead char next
                 break;
@@ -1977,11 +1843,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
 #ifndef QT_NO_WHATSTHIS
                 QWhatsThis::enterWhatsThisMode();
 #endif
-                QT_WA({
-                    DefWindowProc(hwnd, WM_NCPAINT, 1, 0);
-                } , {
-                    DefWindowProcA(hwnd, WM_NCPAINT, 1, 0);
-                });
+                DefWindowProc(hwnd, WM_NCPAINT, 1, 0);
                 break;
 #if defined(QT_NON_COMMERCIAL)
                 QT_NC_SYSCOMMAND
@@ -2043,8 +1905,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
                 break;
 
             if (!msg.wParam) {
-                QString area = QT_WA_INLINE(QString::fromUtf16((unsigned short *)msg.lParam),
-                                             QString::fromLocal8Bit((char*)msg.lParam));
+                QString area = QString::fromWCharArray((wchar_t*)msg.lParam);
                 if (area == QLatin1String("intl")) {
                     QLocalePrivate::updateSystemPrivate();
                     if (!widget->testAttribute(Qt::WA_SetLocale))
@@ -2422,11 +2283,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
                         text = widget->objectName();
                     ret = qMin<int>(wParam - 1, text.size());
                     text.resize(ret);
-                    QT_WA({
-                        memcpy((void *)lParam, text.utf16(), (text.size() + 1) * 2);
-                    }, {
-                        memcpy((void *)lParam, text.toLocal8Bit().data(), text.size() + 1);
-                    });
+                    memcpy((void *)lParam, text.utf16(), (text.size() + 1) * sizeof(ushort));
                     delete acc;
                 }
                 if (!ret) {
@@ -2514,11 +2371,11 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
 
 #ifndef Q_WS_WINCE
         case WM_INPUTLANGCHANGE: {
-            char info[7];
-            if (!GetLocaleInfoA(MAKELCID(lParam, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, info, 6)) {
+            wchar_t info[7];
+            if (!GetLocaleInfo(MAKELCID(lParam, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, info, 6)) {
                 inputcharset = CP_ACP;
             } else {
-                inputcharset = QString::fromLatin1(info).toInt();
+                inputcharset = QString::fromWCharArray(info).toInt();
             }
             QKeyMapper::changeKeyboard();
             break;
@@ -2714,8 +2571,7 @@ bool qt_try_modal(QWidget *widget, MSG *msg, int& ret)
     if (type != WM_NCHITTEST)
 #endif
         if ((type >= WM_MOUSEFIRST && type <= WM_MOUSELAST) ||
-             type == WM_MOUSEWHEEL || type == (int)WM95_MOUSEWHEEL ||
-             type == WM_MOUSEHWHEEL ||
+             type == WM_MOUSEWHEEL || type == WM_MOUSEHWHEEL ||
              type == WM_MOUSELEAVE ||
              (type >= WM_KEYFIRST && type <= WM_KEYLAST)
 #ifndef Q_WS_WINCE
@@ -2955,19 +2811,10 @@ void qt_win_eatMouseMove()
     // reset button state
 
     MSG msg = {0, 0, 0, 0, 0, 0, 0};
-    QT_WA( {
-        while (PeekMessage(&msg, 0, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE))
-            ;
-        if (msg.message == WM_MOUSEMOVE)
-            PostMessage(msg.hwnd, msg.message, 0, msg.lParam);
-    }, {
-        MSG msg;
-        msg.message = 0;
-        while (PeekMessageA(&msg, 0, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE))
-            ;
-        if (msg.message == WM_MOUSEMOVE)
-            PostMessageA(msg.hwnd, msg.message, 0, msg.lParam);
-    } );
+    while (PeekMessage(&msg, 0, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE))
+        ;
+    if (msg.message == WM_MOUSEMOVE)
+        PostMessage(msg.hwnd, msg.message, 0, msg.lParam);
 }
 
 // In DnD, the mouse release event never appears, so the
@@ -3002,8 +2849,8 @@ bool QETWidget::translateMouseEvent(const MSG &msg)
     // Compress mouse move events
     if (msg.message == WM_MOUSEMOVE) {
         MSG mouseMsg;
-        while (winPeekMessage(&mouseMsg, msg.hwnd, WM_MOUSEFIRST,
-                WM_MOUSELAST, PM_NOREMOVE)) {
+        while (PeekMessage(&mouseMsg, msg.hwnd, WM_MOUSEFIRST,
+               WM_MOUSELAST, PM_NOREMOVE)) {
             if (mouseMsg.message == WM_MOUSEMOVE) {
 #define PEEKMESSAGE_IS_BROKEN 1
 #ifdef PEEKMESSAGE_IS_BROKEN
@@ -3014,12 +2861,12 @@ bool QETWidget::translateMouseEvent(const MSG &msg)
                 // key release events (kls 2003-05-13):
                 MSG keyMsg;
                 bool done = false;
-                while (winPeekMessage(&keyMsg, 0, WM_KEYFIRST, WM_KEYLAST,
-                        PM_NOREMOVE)) {
+                while (PeekMessage(&keyMsg, 0, WM_KEYFIRST, WM_KEYLAST,
+                       PM_NOREMOVE)) {
                     if (keyMsg.time < mouseMsg.time) {
                         if ((keyMsg.lParam & 0xC0000000) == 0x40000000) {
-                            winPeekMessage(&keyMsg, 0, keyMsg.message,
-                                            keyMsg.message, PM_REMOVE);
+                            PeekMessage(&keyMsg, 0, keyMsg.message,
+                                        keyMsg.message, PM_REMOVE);
                         } else {
                             done = true;
                             break;
@@ -3045,8 +2892,8 @@ bool QETWidget::translateMouseEvent(const MSG &msg)
                 msgPtr->wParam = mouseMsg.wParam;
                 msgPtr->pt = mouseMsg.pt;
                 // Remove the mouse move message
-                winPeekMessage(&mouseMsg, msg.hwnd, WM_MOUSEMOVE,
-                                WM_MOUSEMOVE, PM_REMOVE);
+                PeekMessage(&mouseMsg, msg.hwnd, WM_MOUSEMOVE,
+                            WM_MOUSEMOVE, PM_REMOVE);
             } else {
                 break; // there was no more WM_MOUSEMOVE event
             }
@@ -3260,7 +3107,7 @@ bool QETWidget::translateMouseEvent(const MSG &msg)
                 POINT widgetpt = gpos;
                 ScreenToClient(hwndTarget, &widgetpt);
                 LPARAM lParam = MAKELPARAM(widgetpt.x, widgetpt.y);
-                winPostMessage(hwndTarget, msg.message, msg.wParam, lParam);
+                PostMessage(hwndTarget, msg.message, msg.wParam, lParam);
             }
         } else if (type == QEvent::MouseButtonRelease && button == Qt::RightButton
                 && QApplication::activePopupWidget() == activePopupWidget) {
@@ -3627,14 +3474,8 @@ static void initWinTabFunctions()
 
     QLibrary library(QLatin1String("wintab32"));
     if (library.load()) {
-        QT_WA({
-            ptrWTInfo = (PtrWTInfo)library.resolve("WTInfoW");
-            ptrWTGet = (PtrWTGet)library.resolve("WTGetW");
-        } , {
-            ptrWTInfo = (PtrWTInfo)library.resolve("WTInfoA");
-            ptrWTGet = (PtrWTGet)library.resolve("WTGetA");
-        });
-
+        ptrWTInfo = (PtrWTInfo)library.resolve("WTInfoW");
+        ptrWTGet = (PtrWTGet)library.resolve("WTGetW");
         ptrWTEnable = (PtrWTEnable)library.resolve("WTEnable");
         ptrWTOverlap = (PtrWTEnable)library.resolve("WTOverlap");
         ptrWTPacketsGet = (PtrWTPacketsGet)library.resolve("WTPacketsGet");
@@ -3861,11 +3702,7 @@ void QApplication::setWheelScrollLines(int n)
 #ifdef SPI_SETWHEELSCROLLLINES
     if (n < 0)
         n = 0;
-    QT_WA({
-        SystemParametersInfo(SPI_SETWHEELSCROLLLINES, (uint)n, 0, 0);
-    } , {
-        SystemParametersInfoA(SPI_SETWHEELSCROLLLINES, (uint)n, 0, 0);
-    });
+    SystemParametersInfo(SPI_SETWHEELSCROLLLINES, (uint)n, 0, 0);
 #else
     QApplicationPrivate::wheel_scroll_lines = n;
 #endif
@@ -3875,11 +3712,7 @@ int QApplication::wheelScrollLines()
 {
 #ifdef SPI_GETWHEELSCROLLLINES
     uint i = 3;
-    QT_WA({
-        SystemParametersInfo(SPI_GETWHEELSCROLLLINES, sizeof(uint), &i, 0);
-    } , {
-        SystemParametersInfoA(SPI_GETWHEELSCROLLLINES, sizeof(uint), &i, 0);
-    });
+    SystemParametersInfo(SPI_GETWHEELSCROLLLINES, sizeof(uint), &i, 0);
     if (i > INT_MAX)
         i = INT_MAX;
     return i;
@@ -3924,8 +3757,7 @@ bool QApplication::isEffectEnabled(Qt::UIEffect effect)
     if (QColormap::instance().depth() < 16)
         return false;
 
-    if (!effect_override && desktopSettingsAware()
-        && !(QSysInfo::WindowsVersion == QSysInfo::WV_95 || QSysInfo::WindowsVersion == QSysInfo::WV_NT)) {
+    if (!effect_override && desktopSettingsAware()) {
         // we know that they can be used when we are here
         BOOL enabled = false;
         UINT api;
@@ -3934,33 +3766,22 @@ bool QApplication::isEffectEnabled(Qt::UIEffect effect)
             api = SPI_GETMENUANIMATION;
             break;
         case Qt::UI_FadeMenu:
-            if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based)
-                return false;
             api = SPI_GETMENUFADE;
             break;
         case Qt::UI_AnimateCombo:
             api = SPI_GETCOMBOBOXANIMATION;
             break;
         case Qt::UI_AnimateTooltip:
-            if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based)
-                api = SPI_GETMENUANIMATION;
-            else
-                api = SPI_GETTOOLTIPANIMATION;
+            api = SPI_GETTOOLTIPANIMATION;
             break;
         case Qt::UI_FadeTooltip:
-            if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based)
-                return false;
             api = SPI_GETTOOLTIPFADE;
             break;
         default:
             api = SPI_GETUIEFFECTS;
             break;
         }
-        QT_WA({
-            SystemParametersInfo(api, 0, &enabled, 0);
-        } , {
-            SystemParametersInfoA(api, 0, &enabled, 0);
-        });
+        SystemParametersInfo(api, 0, &enabled, 0);
         return enabled;
     }
 
diff --git a/src/gui/kernel/qclipboard_win.cpp b/src/gui/kernel/qclipboard_win.cpp
index 09b5448ac0..f5aa088c2a 100644
--- a/src/gui/kernel/qclipboard_win.cpp
+++ b/src/gui/kernel/qclipboard_win.cpp
@@ -200,7 +200,7 @@ HRESULT QtCeGetClipboard(IDataObject** obj)
     if (clipData == 0) {
         clipData = GetClipboardData(CF_UNICODETEXT);
         if (clipData != 0)
-            clipText = QString::fromUtf16((unsigned short *)clipData);
+            clipText = QString::fromWCharArray((wchar_t *)clipData);
     } else {
         clipText = QString::fromLatin1((const char*)clipData);
     }
@@ -325,13 +325,7 @@ bool QClipboard::event(QEvent *e)
     }
 
     if (propagate && d->nextClipboardViewer) {
-        QT_WA({
-            SendMessage(d->nextClipboardViewer, m->message,
-                         m->wParam, m->lParam);
-        } , {
-            SendMessageA(d->nextClipboardViewer, m->message,
-                         m->wParam, m->lParam);
-        });
+        SendMessage(d->nextClipboardViewer, m->message, m->wParam, m->lParam);
     }
 
     return true;
diff --git a/src/gui/kernel/qcursor_win.cpp b/src/gui/kernel/qcursor_win.cpp
index f0dc108290..db008353a8 100644
--- a/src/gui/kernel/qcursor_win.cpp
+++ b/src/gui/kernel/qcursor_win.cpp
@@ -317,54 +317,50 @@ void QCursorData::update()
         phand_bits, phandm_bits
     };
 
-    unsigned short *sh;
+    wchar_t *sh = 0;
     switch (cshape) {                        // map to windows cursor
     case Qt::ArrowCursor:
-        sh = (unsigned short*)IDC_ARROW;
+        sh = IDC_ARROW;
         break;
     case Qt::UpArrowCursor:
-        sh = (unsigned short*)IDC_UPARROW;
+        sh = IDC_UPARROW;
         break;
     case Qt::CrossCursor:
-        sh = (unsigned short*)IDC_CROSS;
+        sh = IDC_CROSS;
         break;
     case Qt::WaitCursor:
-        sh = (unsigned short*)IDC_WAIT;
+        sh = IDC_WAIT;
         break;
     case Qt::IBeamCursor:
-        sh = (unsigned short*)IDC_IBEAM;
+        sh = IDC_IBEAM;
         break;
     case Qt::SizeVerCursor:
-        sh = (unsigned short*)IDC_SIZENS;
+        sh = IDC_SIZENS;
         break;
     case Qt::SizeHorCursor:
-        sh = (unsigned short*)IDC_SIZEWE;
+        sh = IDC_SIZEWE;
         break;
     case Qt::SizeBDiagCursor:
-        sh = (unsigned short*)IDC_SIZENESW;
+        sh = IDC_SIZENESW;
         break;
     case Qt::SizeFDiagCursor:
-        sh = (unsigned short*)IDC_SIZENWSE;
+        sh = IDC_SIZENWSE;
         break;
     case Qt::SizeAllCursor:
-        sh = (unsigned short*)IDC_SIZEALL;
+        sh = IDC_SIZEALL;
         break;
     case Qt::ForbiddenCursor:
-        sh = (unsigned short*)IDC_NO;
+        sh = IDC_NO;
         break;
     case Qt::WhatsThisCursor:
-        sh = (unsigned short*)IDC_HELP;
+        sh = IDC_HELP;
         break;
     case Qt::BusyCursor:
-        sh = (unsigned short*)IDC_APPSTARTING;
+        sh = IDC_APPSTARTING;
         break;
     case Qt::PointingHandCursor:
-        if ((QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) > QSysInfo::WV_95 ||
-            (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) > QSysInfo::WV_NT) {
-            sh = (unsigned short*)IDC_HAND;
-            break;
-        }
-        // fall through
+        sh = IDC_HAND;
+        break;
     case Qt::BlankCursor:
     case Qt::SplitVCursor:
     case Qt::SplitHCursor:
@@ -480,13 +476,7 @@ void QCursorData::update()
         qWarning("QCursor::update: Invalid cursor shape %d", cshape);
         return;
     }
-    // ### From MSDN:
-    // ### LoadCursor has been superseded by the LoadImage function.
-    QT_WA({
-        hcurs = LoadCursorW(0, reinterpret_cast<const TCHAR *>(sh));
-    } , {
-        hcurs = LoadCursorA(0, reinterpret_cast<const char*>(sh));
-    });
+    hcurs = (HCURSOR)LoadImage(0, sh, IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED);
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qdesktopwidget_win.cpp b/src/gui/kernel/qdesktopwidget_win.cpp
index aa290c421a..fb176b7656 100644
--- a/src/gui/kernel/qdesktopwidget_win.cpp
+++ b/src/gui/kernel/qdesktopwidget_win.cpp
@@ -152,41 +152,27 @@ void QDesktopWidgetPrivate::init(QDesktopWidget *that)
 
     rects = new QVector<QRect>();
     workrects = new QVector<QRect>();
+    screenCount = 0;
 
 #ifndef Q_OS_WINCE
-    if (QSysInfo::WindowsVersion != QSysInfo::WV_95 && QSysInfo::WindowsVersion != QSysInfo::WV_NT) {
-        screenCount = 0;
-        // Trying to get the function pointers to Win98/2000 only functions
-        QLibrary user32Lib(QLatin1String("user32"));
-        if (!user32Lib.load())
-            return;
+    QLibrary user32Lib(QLatin1String("user32"));
+    if (user32Lib.load()) {
         enumDisplayMonitors = (EnumFunc)user32Lib.resolve("EnumDisplayMonitors");
-        QT_WA({
-            getMonitorInfo = (InfoFunc)user32Lib.resolve("GetMonitorInfoW");
-        } , {
-            getMonitorInfo = (InfoFunc)user32Lib.resolve("GetMonitorInfoA");
-        });
-
-        if (!enumDisplayMonitors || !getMonitorInfo) {
-            screenCount = GetSystemMetrics(80);  // SM_CMONITORS
-            rects->resize(screenCount);
-            for (int i = 0; i < screenCount; ++i)
-                rects->replace(i, that->rect());
-            return;
-        }
-        // Calls enumCallback
-        enumDisplayMonitors(0, 0, enumCallback, 0);
-        enumDisplayMonitors = 0;
-        getMonitorInfo = 0;
-    } else {
-        rects->resize(1);
-        rects->replace(0, that->rect());
-        workrects->resize(1);
-        workrects->replace(0, that->rect());
+        getMonitorInfo = (InfoFunc)user32Lib.resolve("GetMonitorInfoW");
     }
-#else
-    screenCount = 0;
 
+    if (!enumDisplayMonitors || !getMonitorInfo) {
+        screenCount = GetSystemMetrics(80);  // SM_CMONITORS
+        rects->resize(screenCount);
+        for (int i = 0; i < screenCount; ++i)
+            rects->replace(i, that->rect());
+        return;
+    }
+    // Calls enumCallback
+    enumDisplayMonitors(0, 0, enumCallback, 0);
+    enumDisplayMonitors = 0;
+    getMonitorInfo = 0;
+#else
     QLibrary coreLib(QLatin1String("coredll"));
     if (coreLib.load()) {
         // CE >= 4.0 case
@@ -307,70 +293,61 @@ const QRect QDesktopWidget::availableGeometry(int screen) const
     for(int i=0; i < d->workrects->size(); ++i)
         qt_get_sip_info((*d->workrects)[i]);
 #endif
-    if (QSysInfo::WindowsVersion != QSysInfo::WV_95 && QSysInfo::WindowsVersion != QSysInfo::WV_NT) {
-        if (screen < 0 || screen >= d->screenCount)
-            screen = d->primaryScreen;
+    if (screen < 0 || screen >= d->screenCount)
+        screen = d->primaryScreen;
 
-        return d->workrects->at(screen);
-    } else {
-        return d->workrects->at(d->primaryScreen);
-    }
+    return d->workrects->at(screen);
 }
 
 const QRect QDesktopWidget::screenGeometry(int screen) const
 {
     const QDesktopWidgetPrivate *d = d_func();
-    if (QSysInfo::WindowsVersion != QSysInfo::WV_95 && QSysInfo::WindowsVersion != QSysInfo::WV_NT) {
-        if (screen < 0 || screen >= d->screenCount)
-            screen = d->primaryScreen;
+    if (screen < 0 || screen >= d->screenCount)
+        screen = d->primaryScreen;
 
-        return d->rects->at(screen);
-    } else {
-        return d->rects->at(d->primaryScreen);
-    }
+    return d->rects->at(screen);
 }
 
 int QDesktopWidget::screenNumber(const QWidget *widget) const
 {
     Q_D(const QDesktopWidget);
-    if (QSysInfo::WindowsVersion != QSysInfo::WV_95 && QSysInfo::WindowsVersion != QSysInfo::WV_NT) {
-        if (!widget)
-            return d->primaryScreen;
-        QRect frame = widget->frameGeometry();
-        if (!widget->isWindow())
-            frame.moveTopLeft(widget->mapToGlobal(QPoint(0,0)));
-
-        int maxSize = -1;
-        int maxScreen = -1;
-
-        for (int i = 0; i < d->screenCount; ++i) {
-            QRect sect = d->rects->at(i).intersected(frame);
-            int size = sect.width() * sect.height();
-            if (size > maxSize && sect.width() > 0 && sect.height() > 0) {
-                maxSize = size;
-                maxScreen = i;
-            }
-        }
-        return maxScreen;
-    } else {
+    if (!widget)
         return d->primaryScreen;
+
+    QRect frame = widget->frameGeometry();
+    if (!widget->isWindow())
+        frame.moveTopLeft(widget->mapToGlobal(QPoint(0,0)));
+
+    int maxSize = -1;
+    int maxScreen = -1;
+
+    for (int i = 0; i < d->screenCount; ++i) {
+        QRect sect = d->rects->at(i).intersected(frame);
+        int size = sect.width() * sect.height();
+        if (size > maxSize && sect.width() > 0 && sect.height() > 0) {
+            maxSize = size;
+            maxScreen = i;
+        }
     }
+
+    return maxScreen;
 }
 
 int QDesktopWidget::screenNumber(const QPoint &point) const
 {
     Q_D(const QDesktopWidget);
+
     int closestScreen = -1;
-    if (QSysInfo::WindowsVersion != QSysInfo::WV_95 && QSysInfo::WindowsVersion != QSysInfo::WV_NT) {
-        int shortestDistance = INT_MAX;
-        for (int i = 0; i < d->screenCount; ++i) {
-            int thisDistance = d->pointToRect(point, d->rects->at(i));
-            if (thisDistance < shortestDistance) {
-                shortestDistance = thisDistance;
-                closestScreen = i;
-            }
+    int shortestDistance = INT_MAX;
+
+    for (int i = 0; i < d->screenCount; ++i) {
+        int thisDistance = d->pointToRect(point, d->rects->at(i));
+        if (thisDistance < shortestDistance) {
+            shortestDistance = thisDistance;
+            closestScreen = i;
         }
     }
+
     return closestScreen;
 }
 
diff --git a/src/gui/kernel/qdnd_win.cpp b/src/gui/kernel/qdnd_win.cpp
index 99c960c106..70f89d2aea 100644
--- a/src/gui/kernel/qdnd_win.cpp
+++ b/src/gui/kernel/qdnd_win.cpp
@@ -154,9 +154,9 @@ QOleDataObject::GetData(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium)
 #ifdef QDND_DEBUG
     qDebug("QOleDataObject::GetData(LPFORMATETC pformatetc, LPSTGMEDIUM pmedium)");
 #ifndef Q_OS_WINCE
-    char buf[256] = {0};
-    GetClipboardFormatNameA(pformatetc->cfFormat, buf, 255);
-    qDebug("CF = %d : %s", pformatetc->cfFormat, buf);
+    wchar_t buf[256] = {0};
+    GetClipboardFormatName(pformatetc->cfFormat, buf, 255);
+    qDebug("CF = %d : %s", pformatetc->cfFormat, QString::fromWCharArray(buf));
 #endif
 #endif
 
@@ -398,52 +398,47 @@ void QOleDropSource::createCursors()
             int h = cpm.height();
 
             if (!pm.isNull()) {
-                int x1 = qMin(-hotSpot.x(),0);
-                int x2 = qMax(pm.width()-hotSpot.x(),cpm.width());
-                int y1 = qMin(-hotSpot.y(),0);
-                int y2 = qMax(pm.height()-hotSpot.y(),cpm.height());
+                int x1 = qMin(-hotSpot.x(), 0);
+                int x2 = qMax(pm.width() - hotSpot.x(), cpm.width());
+                int y1 = qMin(-hotSpot.y(), 0);
+                int y2 = qMax(pm.height() - hotSpot.y(), cpm.height());
 
-                w = x2-x1+1;
-                h = y2-y1+1;
+                w = x2 - x1 + 1;
+                h = y2 - y1 + 1;
             }
 
             QRect srcRect = pm.rect();
             QPoint pmDest = QPoint(qMax(0, -hotSpot.x()), qMax(0, -hotSpot.y()));
             QPoint newHotSpot = hotSpot;
 
-#if !defined(Q_OS_WINCE) || defined(GWES_ICONCURS)
-                        bool limitedCursorSize = (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based)
-                                                  || (QSysInfo::WindowsVersion == QSysInfo::WV_NT)
-                                  || (QSysInfo::WindowsVersion == QSysInfo::WV_CE);
-
-            if (limitedCursorSize) {
-                // Limited cursor size
-                int reqw = GetSystemMetrics(SM_CXCURSOR);
-                int reqh = GetSystemMetrics(SM_CYCURSOR);
-
-                QPoint hotspotInPM = newHotSpot - pmDest;
-                if (reqw < w) {
-                    // Not wide enough - move objectpm right
-                    qreal r = qreal(newHotSpot.x()) / w;
-                    newHotSpot = QPoint(int(r * reqw), newHotSpot.y());
-                    if (newHotSpot.x() + cpm.width() > reqw)
-                        newHotSpot.setX(reqw - cpm.width());
-
-                    srcRect = QRect(QPoint(hotspotInPM.x() - newHotSpot.x(), srcRect.top()), QSize(reqw, srcRect.height()));
-                }
-                if (reqh < h) {
-                    qreal r = qreal(newHotSpot.y()) / h;
-                    newHotSpot = QPoint(newHotSpot.x(), int(r * reqh));
-                    if (newHotSpot.y() + cpm.height() > reqh)
-                        newHotSpot.setY(reqh - cpm.height());
-
-                    srcRect = QRect(QPoint(srcRect.left(), hotspotInPM.y() - newHotSpot.y()), QSize(srcRect.width(), reqh));
-                }
-                // Always use system cursor size
-                w = reqw;
-                h = reqh;
+#if defined(Q_OS_WINCE)
+            // Limited cursor size
+            int reqw = GetSystemMetrics(SM_CXCURSOR);
+            int reqh = GetSystemMetrics(SM_CYCURSOR);
+
+            QPoint hotspotInPM = newHotSpot - pmDest;
+            if (reqw < w) {
+                // Not wide enough - move objectpm right
+                qreal r = qreal(newHotSpot.x()) / w;
+                newHotSpot = QPoint(int(r * reqw), newHotSpot.y());
+                if (newHotSpot.x() + cpm.width() > reqw)
+                    newHotSpot.setX(reqw - cpm.width());
+
+                srcRect = QRect(QPoint(hotspotInPM.x() - newHotSpot.x(), srcRect.top()), QSize(reqw, srcRect.height()));
             }
+            if (reqh < h) {
+                qreal r = qreal(newHotSpot.y()) / h;
+                newHotSpot = QPoint(newHotSpot.x(), int(r * reqh));
+                if (newHotSpot.y() + cpm.height() > reqh)
+                    newHotSpot.setY(reqh - cpm.height());
+
+                srcRect = QRect(QPoint(srcRect.left(), hotspotInPM.y() - newHotSpot.y()), QSize(srcRect.width(), reqh));
+            }
+            // Always use system cursor size
+            w = reqw;
+            h = reqh;
 #endif
+
             QPixmap newCursor(w, h);
             if (!pm.isNull()) {
                 newCursor.fill(QColor(0, 0, 0, 0));
diff --git a/src/gui/kernel/qguifunctions_wince.cpp b/src/gui/kernel/qguifunctions_wince.cpp
index c9861170ea..011c726f00 100644
--- a/src/gui/kernel/qguifunctions_wince.cpp
+++ b/src/gui/kernel/qguifunctions_wince.cpp
@@ -215,13 +215,7 @@ int qt_wince_GetDIBits(HDC /*hdc*/ , HBITMAP hSourceBitmap, uint, uint, LPVOID l
     return ret;
 }
 
-bool qt_wince_TextOutW(HDC hdc, int x, int y, LPWSTR lpString, UINT c)
-{
-    return ExtTextOutW(hdc, x, y, 0, NULL, lpString, c, NULL);
-}
-
-
-HINSTANCE qt_wince_ShellExecute(HWND hwnd, LPCTSTR, LPCTSTR file, LPCTSTR params, LPCTSTR dir, int showCmd)
+HINSTANCE qt_wince_ShellExecute(HWND hwnd, LPCWSTR, LPCWSTR file, LPCWSTR params, LPCWSTR dir, int showCmd)
 {
     SHELLEXECUTEINFO info;
     info.hwnd = hwnd;
@@ -253,17 +247,11 @@ COLORREF qt_wince_PALETTEINDEX( WORD /*wPaletteIndex*/)
     return 0;
 }
 
-BOOL qt_wince_TextOut( HDC hdc, int nXStart, int nYStart, LPCTSTR lpString, int cbString )
-{
-    return ExtTextOut( hdc, nXStart, nYStart - 16, 0, NULL, lpString, cbString, NULL );
-}
-
 // Internal Qt -----------------------------------------------------
 bool qt_wince_is_platform(const QString &platformString) {
-    TCHAR tszPlatform[64];
-    if (SystemParametersInfo(SPI_GETPLATFORMTYPE,
-                             sizeof(tszPlatform)/sizeof(*tszPlatform),tszPlatform,0))
-      if (0 == _tcsicmp(reinterpret_cast<const wchar_t *> (platformString.utf16()), tszPlatform))
+    wchar_t tszPlatform[64];
+    if (SystemParametersInfo(SPI_GETPLATFORMTYPE, sizeof(tszPlatform) / sizeof(wchar_t), tszPlatform, 0))
+        if (0 == _tcsicmp(reinterpret_cast<const wchar_t *> (platformString.utf16()), tszPlatform))
             return true;
     return false;
 }
@@ -316,8 +304,8 @@ void qt_wince_maximize(QWidget *widget)
 
 void qt_wince_minimize(HWND hwnd) {
 
-    uint exstyle = GetWindowLongW(hwnd, GWL_EXSTYLE);
-    uint style = GetWindowLongW(hwnd, GWL_STYLE);
+    uint exstyle = GetWindowLong(hwnd, GWL_EXSTYLE);
+    uint style = GetWindowLong(hwnd, GWL_STYLE);
     RECT rect;
     RECT crect = {0,0,0,0};
     GetWindowRect(hwnd, &rect);
diff --git a/src/gui/kernel/qguifunctions_wince.h b/src/gui/kernel/qguifunctions_wince.h
index bcf2004ea8..234c8c6e4d 100644
--- a/src/gui/kernel/qguifunctions_wince.h
+++ b/src/gui/kernel/qguifunctions_wince.h
@@ -73,10 +73,6 @@ int qt_wince_GetDIBits(HDC, HBITMAP, uint, uint, void*, LPBITMAPINFO, uint);
 // QWidget
 #define SW_SHOWMINIMIZED SW_MINIMIZE
 
-// QPaintEngine
-bool qt_wince_TextOutW(HDC, int, int, LPWSTR, UINT);
-#define TextOutW(a,b,c,d,e) qt_wince_TextOutW(a,b,c,d,e)
-
 // QRegion
 #define ALTERNATE 0
 #define WINDING 1
@@ -128,7 +124,7 @@ typedef struct tagTTPOLYCURVE
 #define TT_PRIM_CSPLINE 3
 #define ANSI_VAR_FONT 12
 
-HINSTANCE qt_wince_ShellExecute(HWND hwnd, LPCTSTR operation, LPCTSTR file, LPCTSTR params, LPCTSTR dir, int showCmd);
+HINSTANCE qt_wince_ShellExecute(HWND hwnd, LPCWSTR operation, LPCWSTR file, LPCWSTR params, LPCWSTR dir, int showCmd);
 #define ShellExecute(a,b,c,d,e,f) qt_wince_ShellExecute(a,b,c,d,e,f)
 
 
@@ -150,8 +146,6 @@ HWND qt_wince_SetClipboardViewer(
 // Graphics ---------------------------------------------------------
 COLORREF qt_wince_PALETTEINDEX( WORD wPaletteIndex );
 #define PALETTEINDEX(a) qt_wince_PALETTEINDEX(a)
-BOOL qt_wince_TextOut( HDC hdc, int nXStart, int nYStart, LPCTSTR lpString, int cbString );
-#define TextOut(a,b,c,d,e) qt_wince_TextOut(a,b,c,d,e)
 
 #endif // Q_OS_WINCE
 #endif // QGUIFUNCTIONS_WCE_H
diff --git a/src/gui/kernel/qkeymapper_win.cpp b/src/gui/kernel/qkeymapper_win.cpp
index e40dfa0d33..3d53f311a1 100644
--- a/src/gui/kernel/qkeymapper_win.cpp
+++ b/src/gui/kernel/qkeymapper_win.cpp
@@ -57,9 +57,7 @@ QT_BEGIN_NAMESPACE
 
 // Implemented elsewhere
 extern "C" LRESULT CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM);
-Q_CORE_EXPORT bool winPostMessage(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
-Q_CORE_EXPORT bool winPeekMessage(MSG* msg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax,
-                                  UINT wRemoveMsg);
+
 extern Q_CORE_EXPORT QLocale qt_localeFromLCID(LCID id);
 #ifndef LANG_PASHTO
 #define LANG_PASHTO 0x63
@@ -467,12 +465,7 @@ static inline int toKeyOrUnicode(int vk, int scancode, unsigned char *kbdBuffer,
     Q_ASSERT(vk > 0 && vk < 256);
     int code = 0;
     QChar unicodeBuffer[5];
-    int res = 0;
-    if (QSysInfo::WindowsVersion < QSysInfo::WV_NT)
-        res = ToAscii(vk, scancode, kbdBuffer, reinterpret_cast<LPWORD>(unicodeBuffer), 0);
-    else
-        res = ToUnicode(vk, scancode, kbdBuffer, reinterpret_cast<LPWSTR>(unicodeBuffer), 5, 0);
-
+    int res = ToUnicode(vk, scancode, kbdBuffer, reinterpret_cast<LPWSTR>(unicodeBuffer), 5, 0);
     if (res)
         code = unicodeBuffer[0].toUpper().unicode();
 
@@ -504,38 +497,6 @@ static inline int asciiToKeycode(char a, int state)
     return a & 0xff;
 }
 
-static int inputcharset = CP_ACP;
-static inline QChar wmchar_to_unicode(DWORD c)
-{
-    // qt_winMB2QString is the generalization of this function.
-    QT_WA({
-        return QChar((ushort)c);
-    } , {
-        char mb[2];
-        mb[0] = c & 0xff;
-        mb[1] = 0;
-        WCHAR wc[1];
-        MultiByteToWideChar(inputcharset, MB_PRECOMPOSED, mb, -1, wc, 1);
-        return QChar(wc[0]);
-    });
-}
-
-static inline QChar imechar_to_unicode(DWORD c)
-{
-    // qt_winMB2QString is the generalization of this function.
-    QT_WA({
-        return QChar((ushort)c);
-    } , {
-        char mb[3];
-        mb[0] = (c >> 8) & 0xff;
-        mb[1] = c & 0xff;
-        mb[2] = 0;
-        WCHAR wc[1];
-        MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, mb, -1, wc, 1);
-        return QChar(wc[0]);
-    });
-}
-
 static inline bool isModifierKey(int code)
 {
     return (code >= Qt::Key_Shift) && (code <= Qt::Key_ScrollLock);
@@ -635,43 +596,15 @@ void QKeyMapperPrivate::clearMappings()
 
     /* MAKELCID()'s first argument is a WORD, and GetKeyboardLayout()
      * returns a DWORD. */
-//    LCID newLCID = MAKELCID(DWORD(GetKeyboardLayout(0)), SORT_DEFAULT);
+
+    LCID newLCID = MAKELCID((DWORD)GetKeyboardLayout(0), SORT_DEFAULT);
 //    keyboardInputLocale = qt_localeFromLCID(newLCID);
-     LCID newLCID = MAKELCID(
-         reinterpret_cast<long>(GetKeyboardLayout(0)),
-         SORT_DEFAULT
-     );
-     keyboardInputLocale = qt_localeFromLCID(newLCID);
+
     bool bidi = false;
-#ifdef UNICODE
-    if (QSysInfo::WindowsVersion >= QSysInfo::WV_2000) {
-        WCHAR wchLCIDFontSig[16];
-        if (GetLocaleInfoW(newLCID,
-                           LOCALE_FONTSIGNATURE,
-                           &wchLCIDFontSig[0],
-                           (sizeof(wchLCIDFontSig)/sizeof(WCHAR)))
-            && (wchLCIDFontSig[7] & (WCHAR)0x0800))
+    wchar_t LCIDFontSig[16];
+    if (GetLocaleInfo(newLCID, LOCALE_FONTSIGNATURE, LCIDFontSig, sizeof(LCIDFontSig) / sizeof(wchar_t))
+        && (LCIDFontSig[7] & (wchar_t)0x0800))
         bidi = true;
-    } else
-#endif //UNICODE
-    {
-        if (newLCID == 0x0859 ||  //Sindhi (Arabic script)
-            newLCID == 0x0460)    //Kashmiri (Arabic script)
-            bidi = true;;
-
-        switch (PRIMARYLANGID(newLCID))
-        {
-            case LANG_ARABIC:
-            case LANG_HEBREW:
-            case LANG_URDU:
-            case LANG_FARSI:
-            case LANG_PASHTO:
-            //case LANG_UIGHUR:
-            case LANG_SYRIAC:
-            case LANG_DIVEHI:
-                bidi = true;
-        }
-    }
 
     keyboardInputDirection = bidi ? Qt::RightToLeft : Qt::LeftToRight;
 }
@@ -760,7 +693,7 @@ void QKeyMapperPrivate::updatePossibleKeyCodes(unsigned char *kbdBuffer, quint32
     keyLayout[vk_key]->qtKey[8] = fallbackKey;
 
     // If this vk_key a Dead Key
-    if (MapVirtualKey(vk_key, 2) & 0x80008000) { // (High-order dead key on Win 95 is 0x8000)
+    if (MapVirtualKey(vk_key, 2) & 0x80000000) {
         // Push a Space, then the original key through the low-level ToAscii functions.
         // We do this because these functions (ToAscii / ToUnicode) will alter the internal state of
         // the keyboard driver By doing the following, we set the keyboard driver state back to what
@@ -837,13 +770,13 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, const MSG &msg, bool
     bool isNumpad = (msg.wParam >= VK_NUMPAD0 && msg.wParam <= VK_NUMPAD9);
     quint32 nModifiers = 0;
 
-    if (QSysInfo::WindowsVersion < QSysInfo::WV_NT || QSysInfo::WindowsVersion & QSysInfo::WV_CE_based) {
+#if defined(QT_OS_WINCE)
         nModifiers |= (GetKeyState(VK_SHIFT  ) < 0 ? ShiftAny : 0);
         nModifiers |= (GetKeyState(VK_CONTROL) < 0 ? ControlAny : 0);
         nModifiers |= (GetKeyState(VK_MENU   ) < 0 ? AltAny : 0);
         nModifiers |= (GetKeyState(VK_LWIN   ) < 0 ? MetaLeft : 0);
         nModifiers |= (GetKeyState(VK_RWIN   ) < 0 ? MetaRight : 0);
-    } else {
+#else
         // Map native modifiers to some bit representation
         nModifiers |= (GetKeyState(VK_LSHIFT  ) & 0x80 ? ShiftLeft : 0);
         nModifiers |= (GetKeyState(VK_RSHIFT  ) & 0x80 ? ShiftRight : 0);
@@ -857,7 +790,8 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, const MSG &msg, bool
         nModifiers |= (GetKeyState(VK_CAPITAL ) & 0x01 ? CapsLock : 0);
         nModifiers |= (GetKeyState(VK_NUMLOCK ) & 0x01 ? NumLock : 0);
         nModifiers |= (GetKeyState(VK_SCROLL  ) & 0x01 ? ScrollLock : 0);
-    }
+#endif // QT_OS_WINCE
+
     if (msg.lParam & ExtendedKey)
         nModifiers |= msg.lParam & ExtendedKey;
 
@@ -870,12 +804,12 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, const MSG &msg, bool
 
     // Now we know enough to either have MapVirtualKey or our own keymap tell us if it's a deadkey
     bool isDeadKey = isADeadKey(msg.wParam, state)
-                     || MapVirtualKey(msg.wParam, 2) & 0x80008000; // High-order on 95 is 0x8000
+                     || MapVirtualKey(msg.wParam, 2) & 0x80000000;
 
     // A multi-character key not found by our look-ahead
     if (msgType == WM_CHAR) {
         QString s;
-        QChar ch = wmchar_to_unicode(msg.wParam);
+        QChar ch = QChar((ushort)msg.wParam);
         if (!ch.isNull())
             s += ch;
 
@@ -886,7 +820,7 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, const MSG &msg, bool
     // Input method characters not found by our look-ahead
     else if (msgType == WM_IME_CHAR) {
         QString s;
-        QChar ch = imechar_to_unicode(msg.wParam);
+        QChar ch = QChar((ushort)msg.wParam);
         if (!ch.isNull())
             s += ch;
 
@@ -1050,11 +984,9 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, const MSG &msg, bool
                                 : msgType == WM_IME_KEYDOWN ? WM_IME_CHAR : WM_SYSCHAR);
 
             QChar uch;
-            if (winPeekMessage(&wm_char, 0, charType, charType, PM_REMOVE)) {
+            if (PeekMessage(&wm_char, 0, charType, charType, PM_REMOVE)) {
                 // Found a ?_CHAR
-                uch = charType == WM_IME_CHAR
-                                    ? imechar_to_unicode(wm_char.wParam)
-                                    : wmchar_to_unicode(wm_char.wParam);
+                uch = QChar((ushort)wm_char.wParam);
                 if (msgType == WM_SYSKEYDOWN && uch.isLetter() && (msg.lParam & KF_ALTDOWN))
                     uch = uch.toLower(); // (See doc of WM_SYSCHAR) Alt-letter
                 if (!code && !uch.row())
@@ -1067,7 +999,7 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, const MSG &msg, bool
             // to find the correct key using the current message parameters & keyboard state.
             if (uch.isNull() && msgType == WM_IME_KEYDOWN) {
                 BYTE keyState[256];
-                WCHAR newKey[3] = {0};
+                wchar_t newKey[3] = {0};
                 GetKeyboardState(keyState);
                 int val = ToUnicode(vk_key, scancode, keyState, newKey, 2,  0);
                 if (val == 1) {
@@ -1085,18 +1017,10 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, const MSG &msg, bool
                     uch = QChar(QLatin1Char(0x7f)); // Windows doesn't know this one.
                 } else {
                     if (msgType != WM_SYSKEYDOWN || !code) {
-                        UINT map;
-                        QT_WA({
-                            map = MapVirtualKey(msg.wParam, 2);
-                        } , {
-                            map = MapVirtualKeyA(msg.wParam, 2);
-                            // High-order bit is 0x8000 on '95
-                            if (map & 0x8000)
-                                map = (map^0x8000)|0x80000000;
-                        });
+                        UINT map = MapVirtualKey(msg.wParam, 2);
                         // If the high bit of the return value is set, it's a deadkey
                         if (!(map & 0x80000000))
-                            uch = wmchar_to_unicode((DWORD)map);
+                            uch = QChar((ushort)map);
                     }
                 }
                 if (!code && !uch.row())
@@ -1237,6 +1161,8 @@ bool QKeyMapper::sendKeyEvent(QWidget *widget, bool grab,
         if (QApplicationPrivate::instance()->qt_tryAccelEvent(widget, &a))
             return true;
     }
+#else
+    Q_UNUSED(grab);
 #endif
     if (!widget->isEnabled())
         return false;
diff --git a/src/gui/kernel/qmime_win.cpp b/src/gui/kernel/qmime_win.cpp
index bc15638602..c7559d88aa 100644
--- a/src/gui/kernel/qmime_win.cpp
+++ b/src/gui/kernel/qmime_win.cpp
@@ -281,11 +281,7 @@ QWindowsMime::~QWindowsMime()
 */
 int QWindowsMime::registerMimeType(const QString &mime)
 {
-#ifdef Q_OS_WINCE
     int f = RegisterClipboardFormat(reinterpret_cast<const wchar_t *> (mime.utf16()));
-#else
-    int f = RegisterClipboardFormatA(mime.toLocal8Bit());
-#endif
     if (!f)
         qErrnoWarning("QWindowsMime::registerMimeType: Failed to register clipboard format");
 
@@ -401,9 +397,9 @@ QStringList QWindowsMime::allMimesForFormats(IDataObject *pDataObj)
         while (S_OK == fmtenum->Next(1, &fmtetc, 0)) {
 #if defined(QMIME_DEBUG) && !defined(Q_OS_WINCE)
             qDebug("QWindowsMime::allMimesForFormats()");
-            char buf[256] = {0};
-            GetClipboardFormatNameA(fmtetc.cfFormat, buf, 255);
-            qDebug("CF = %d : %s", fmtetc.cfFormat, buf);
+            wchar_t buf[256] = {0};
+            GetClipboardFormatName(fmtetc.cfFormat, buf, 255);
+            qDebug("CF = %d : %s", fmtetc.cfFormat, QString::fromWCharArray(buf));
 #endif
             for (int i=mimes.size()-1; i>=0; --i) {
                 QString format = mimes.at(i)->mimeForFormat(fmtetc);
@@ -504,7 +500,7 @@ bool QWindowsMimeText::convertFromMime(const FORMATETC &formatetc, const QMimeDa
                 ++u;
             }
             res.truncate(ri);
-            const int byteLength = res.length()*2;
+            const int byteLength = res.length() * sizeof(ushort);
             QByteArray r(byteLength + 2, '\0');
             memcpy(r.data(), res.unicode(), byteLength);
             r[byteLength] = 0;
@@ -549,7 +545,7 @@ QVariant QWindowsMimeText::convertToMime(const QString &mime, LPDATAOBJECT pData
         QString str;
         QByteArray data = getData(CF_UNICODETEXT, pDataObj);
         if (!data.isEmpty()) {
-            str = QString::fromUtf16((const unsigned short *)data.data());
+            str = QString::fromWCharArray((const wchar_t *)data.data());
             str.replace(QLatin1String("\r\n"), QLatin1String("\n"));
         } else {
             data = getData(CF_TEXT, pDataObj);
@@ -620,11 +616,7 @@ bool QWindowsMimeURI::convertFromMime(const FORMATETC &formatetc, const QMimeDat
             for (int i=0; i<urls.size(); i++) {
                 QString fn = QDir::toNativeSeparators(urls.at(i).toLocalFile());
                 if (!fn.isEmpty()) {
-                    QT_WA({
-                        size += sizeof(TCHAR)*(fn.length()+1);
-                    } , {
-                        size += fn.toLocal8Bit().length()+1;
-                    });
+                    size += sizeof(ushort) * (fn.length() + 1);
                     fileNames.append(fn);
                 }
             }
@@ -636,36 +628,22 @@ bool QWindowsMimeURI::convertFromMime(const FORMATETC &formatetc, const QMimeDat
             d->fNC = true;
             char* files = ((char*)d) + d->pFiles;
 
-            QT_WA({
-                d->fWide = true;
-                TCHAR* f = (TCHAR*)files;
-                for (int i=0; i<fileNames.size(); i++) {
-                    int l = fileNames.at(i).length();
-                    memcpy(f, fileNames.at(i).utf16(), l*sizeof(TCHAR));
-                    f += l;
-                    *f++ = 0;
-                }
-                *f = 0;
-            } , {
-                d->fWide = false;
-                char* f = files;
-                for (int i=0; i<fileNames.size(); i++) {
-                    QByteArray c = fileNames.at(i).toLocal8Bit();
-                    if (!c.isEmpty()) {
-                        int l = c.length();
-                        memcpy(f, c.constData(), l);
-                        f += l;
-                        *f++ = 0;
-                    }
-                }
-                *f = 0;
-            });
+            d->fWide = true;
+            wchar_t* f = (wchar_t*)files;
+            for (int i=0; i<fileNames.size(); i++) {
+                int l = fileNames.at(i).length();
+                memcpy(f, fileNames.at(i).utf16(), l * sizeof(ushort));
+                f += l;
+                *f++ = 0;
+            }
+            *f = 0;
+
             return setData(result, pmedium);
         } else if (getCf(formatetc) == CF_INETURL_W) {
             QList<QUrl> urls = mimeData->urls();
             QByteArray result;
             QString url = urls.at(0).toString();
-            result = QByteArray((const char *)url.utf16(), url.length() * 2);
+            result = QByteArray((const char *)url.utf16(), url.length() * sizeof(ushort));
             result.append('\0');
             result.append('\0');
             return setData(result, pmedium);
@@ -720,15 +698,15 @@ QVariant QWindowsMimeURI::convertToMime(const QString &mimeType, LPDATAOBJECT pD
 
             LPDROPFILES hdrop = (LPDROPFILES)data.data();
             if (hdrop->fWide) {
-                const ushort* filesw = (const ushort*)(data.data() + hdrop->pFiles);
-                int i=0;
+                const wchar_t* filesw = (const wchar_t *)(data.data() + hdrop->pFiles);
+                int i = 0;
                 while (filesw[i]) {
-                    QString fileurl = QString::fromUtf16(filesw+i);
+                    QString fileurl = QString::fromWCharArray(filesw + i);
                     urls += QUrl::fromLocalFile(fileurl);
                     i += fileurl.length()+1;
                 }
             } else {
-                const char* files = (const char*)data.data() + hdrop->pFiles;
+                const char* files = (const char *)data.data() + hdrop->pFiles;
                 int i=0;
                 while (files[i]) {
                     urls += QUrl::fromLocalFile(QString::fromLocal8Bit(files+i));
@@ -744,7 +722,7 @@ QVariant QWindowsMimeURI::convertToMime(const QString &mimeType, LPDATAOBJECT pD
             QByteArray data = getData(CF_INETURL_W, pDataObj);
             if (data.isEmpty())
                 return QVariant();
-            return QUrl(QString::fromUtf16((const unsigned short *)data.constData()));
+            return QUrl(QString::fromWCharArray((const wchar_t *)data.constData()));
          } else if (canGetData(CF_INETURL, pDataObj)) {
             QByteArray data = getData(CF_INETURL, pDataObj);
             if (data.isEmpty())
@@ -913,11 +891,7 @@ private:
 
 QWindowsMimeImage::QWindowsMimeImage()
 {
-#ifdef Q_OS_WINCE
-    CF_PNG = RegisterClipboardFormat(reinterpret_cast<const wchar_t *> (QString::fromLatin1("PNG").utf16()));
-#else
-    CF_PNG = RegisterClipboardFormatA("PNG");
-#endif
+    CF_PNG = RegisterClipboardFormat(L"PNG");
 }
 
 QVector<FORMATETC> QWindowsMimeImage::formatsForMime(const QString &mimeType, const QMimeData *mimeData) const
@@ -1114,7 +1088,7 @@ bool QBuiltInMimes::convertFromMime(const FORMATETC &formatetc, const QMimeData
                 ++u;
             }
             res.truncate(ri);
-            const int byteLength = res.length()*2;
+            const int byteLength = res.length() * sizeof(ushort);
             QByteArray r(byteLength + 2, '\0');
             memcpy(r.data(), res.unicode(), byteLength);
             r[byteLength] = 0;
@@ -1154,8 +1128,8 @@ QVariant QBuiltInMimes::convertToMime(const QString &mimeType, IDataObject *pDat
             qDebug("QBuiltInMimes::convertToMime()");
 #endif
             if (mimeType == QLatin1String("text/html") && preferredType == QVariant::String) {
-                // text/html is in wide chars on windows (compatible with mozillia)
-                val = QString::fromUtf16((const unsigned short *)data.data());
+                // text/html is in wide chars on windows (compatible with Mozilla)
+                val = QString::fromWCharArray((const wchar_t *)data.data());
             } else {
                 val = data; // it should be enough to return the data and let QMimeData do the rest.
             }
@@ -1280,11 +1254,7 @@ bool QLastResortMimes::canConvertToMime(const QString &mimeType, IDataObject *pD
 {
     if (isCustomMimeType(mimeType)) {
         QString clipFormat = customMimeType(mimeType);
-#ifdef Q_OS_WINCE
         int cf = RegisterClipboardFormat(reinterpret_cast<const wchar_t *> (clipFormat.utf16()));
-#else
-        int cf = RegisterClipboardFormatA(clipFormat.toLocal8Bit());
-#endif
         return canGetData(cf, pDataObj);
     } else if (formats.keys(mimeType).isEmpty()) {
         // if it is not in there then register it an see if we can get it
@@ -1304,11 +1274,7 @@ QVariant QLastResortMimes::convertToMime(const QString &mimeType, IDataObject *p
         QByteArray data;
         if (isCustomMimeType(mimeType)) {
             QString clipFormat = customMimeType(mimeType);
-#ifdef Q_OS_WINCE
             int cf = RegisterClipboardFormat(reinterpret_cast<const wchar_t *> (clipFormat.utf16()));
-#else
-            int cf = RegisterClipboardFormatA(clipFormat.toLocal8Bit());
-#endif
             data = getData(cf, pDataObj);
         } else if (formats.keys(mimeType).isEmpty()) {
             int cf = QWindowsMime::registerMimeType(mimeType);
@@ -1325,46 +1291,38 @@ QVariant QLastResortMimes::convertToMime(const QString &mimeType, IDataObject *p
 QString QLastResortMimes::mimeForFormat(const FORMATETC &formatetc) const
 {
     QString format = formats.value(getCf(formatetc));
-    if (format.isEmpty()) {
-        QByteArray ba;
-        QString clipFormat;
-        int len;
-        QT_WA({
-            ba.resize(256*2);
-            len = GetClipboardFormatNameW(getCf(formatetc), (TCHAR*)ba.data(), 255);
-            if (len) 
-                clipFormat = QString::fromUtf16((ushort *)ba.data(), len);
-        } , {
-            ba.resize(256);
-            len = GetClipboardFormatNameA(getCf(formatetc), ba.data(), 255);
-            if (len)
-                clipFormat = QString::fromLocal8Bit(ba.data(), len);
-       });
-        if (len) {
+    if (!format.isEmpty())
+        return format;
+
+    wchar_t buffer[256];
+    int len = GetClipboardFormatName(getCf(formatetc), buffer, 256);
+
+    if (len) {
+        QString clipFormat = QString::fromWCharArray(buffer, len);
 #ifndef QT_NO_DRAGANDDROP
-            if (QInternalMimeData::canReadData(clipFormat))
-                format = clipFormat;
-            else if((formatetc.cfFormat >= 0xC000)){
-                //create the mime as custom. not registered.
-                if (!excludeList.contains(clipFormat, Qt::CaseInsensitive)) {
-                    //check if this is a mime type
-                    bool ianaType = false;
-                    int sz = ianaTypes.size();
-                    for (int i = 0; i < sz; i++) {
-                        if (clipFormat.startsWith(ianaTypes[i], Qt::CaseInsensitive)) {
-                            ianaType =  true;
-                            break;
-                        }
+        if (QInternalMimeData::canReadData(clipFormat))
+            format = clipFormat;
+        else if((formatetc.cfFormat >= 0xC000)){
+            //create the mime as custom. not registered.
+            if (!excludeList.contains(clipFormat, Qt::CaseInsensitive)) {
+                //check if this is a mime type
+                bool ianaType = false;
+                int sz = ianaTypes.size();
+                for (int i = 0; i < sz; i++) {
+                    if (clipFormat.startsWith(ianaTypes[i], Qt::CaseInsensitive)) {
+                        ianaType =  true;
+                        break;
                     }
-                    if (!ianaType)
-                        format = QLatin1String(x_qt_windows_mime) + clipFormat + QLatin1Char('\"');
-                    else
-                        format = clipFormat;
                 }
+                if (!ianaType)
+                    format = QLatin1String(x_qt_windows_mime) + clipFormat + QLatin1Char('\"');
+                else
+                    format = clipFormat;
             }
-#endif //QT_NO_DRAGANDDROP
         }
+#endif //QT_NO_DRAGANDDROP
     }
+
     return format;
 }
 
diff --git a/src/gui/kernel/qsound_win.cpp b/src/gui/kernel/qsound_win.cpp
index 7330d4b96f..82854aec94 100644
--- a/src/gui/kernel/qsound_win.cpp
+++ b/src/gui/kernel/qsound_win.cpp
@@ -77,13 +77,8 @@ public:
 QAuServerWindows::QAuServerWindows(QObject* parent) :
     QAuServer(parent), current(0)
 {
-    QT_WA({
-        mutex = CreateMutexW(0, 0, 0);
-        event = CreateEventW(0, FALSE, FALSE, 0);
-    } , {
-        mutex = CreateMutexA(0, 0, 0);
-        event = CreateEventA(0, FALSE, FALSE, 0);
-    });
+    mutex = CreateMutex(0, 0, 0);
+    event = CreateEvent(0, FALSE, FALSE, 0);
 }
 
 QAuServerWindows::~QAuServerWindows()
@@ -133,13 +128,9 @@ DWORD WINAPI SoundPlayProc(LPVOID param)
         if (loops == -1)
             flags |= SND_LOOP;
 
-        QT_WA({
-            PlaySoundW((TCHAR*)filename.utf16(), 0, flags);
-        } , {
-            PlaySoundA(QFile::encodeName(filename).data(), 0, flags);
-        });
-	if (sound && loops == 1)
-	    server->decLoop(sound);
+        PlaySound((wchar_t*)filename.utf16(), 0, flags);
+        if (sound && loops == 1)
+            server->decLoop(sound);
 
         // GUI thread continues, but we are done as well.
         SetEvent(event);
@@ -148,18 +139,13 @@ DWORD WINAPI SoundPlayProc(LPVOID param)
         QPointer<QSound> guarded_sound = sound;
         SetEvent(event);
 
-	for (int l = 0; l < loops && server->current; ++l) {
-	    QT_WA( {
-		PlaySoundW( (TCHAR*)filename.utf16(), 0, SND_FILENAME|SND_SYNC );
-	    } , {
-		PlaySoundA( QFile::encodeName(filename).data(), 0,
-		    SND_FILENAME|SND_SYNC );
-	    } );
-
-	    if (guarded_sound)
-		server->decLoop(guarded_sound);
-	}
-	server->current = 0;
+        for (int l = 0; l < loops && server->current; ++l) {
+            PlaySound((wchar_t*)filename.utf16(), 0, SND_FILENAME | SND_SYNC);
+
+            if (guarded_sound)
+                server->decLoop(guarded_sound);
+        }
+        server->current = 0;
     }
     ReleaseMutex(mutex);
 
@@ -169,7 +155,7 @@ DWORD WINAPI SoundPlayProc(LPVOID param)
 void QAuServerWindows::playHelper(const QString &filename, int loop, QSound *snd)
 {
     if (loop == 0)
-	return;
+        return;
     // busy?
     if (WaitForSingleObject(mutex, 0) == WAIT_TIMEOUT)
         return;
diff --git a/src/gui/kernel/qwhatsthis.cpp b/src/gui/kernel/qwhatsthis.cpp
index 067c7839f4..f38b0f6a27 100644
--- a/src/gui/kernel/qwhatsthis.cpp
+++ b/src/gui/kernel/qwhatsthis.cpp
@@ -226,7 +226,9 @@ QWhatsThat::QWhatsThat(const QString& txt, QWidget* parent, QWidget *showTextFor
                                         text);
     }
 #if defined(Q_WS_WIN)
-    if ((QSysInfo::WindowsVersion&QSysInfo::WV_NT_based) > QSysInfo::WV_2000) {
+    if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
+        && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
+    {
         BOOL shadow;
         SystemParametersInfo(SPI_GETDROPSHADOW, 0, &shadow, 0);
         shadowWidth = shadow ? 0 : 6;
@@ -302,7 +304,9 @@ void QWhatsThat::paintEvent(QPaintEvent*)
 {
     bool drawShadow = true;
 #if defined(Q_WS_WIN)
-    if ((QSysInfo::WindowsVersion&QSysInfo::WV_NT_based) > QSysInfo::WV_2000) {
+    if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
+        && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
+    {
         BOOL shadow;
         SystemParametersInfo(SPI_GETDROPSHADOW, 0, &shadow, 0);
         drawShadow = !shadow;
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 304d72a126..1b31318d4f 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -863,8 +863,8 @@ void QWidget::setAutoFillBackground(bool enabled)
     \list
     \o X11: This feature relies on the use of an X server that supports ARGB visuals
     and a compositing window manager.
-    \o Windows: This feature requires Windows 2000 or later. The widget needs to have
-    the Qt::FramelessWindowHint window flag set for the translucency to work.
+    \o Windows: The widget needs to have the Qt::FramelessWindowHint window flag set
+    for the translucency to work.
     \endlist
 
 
@@ -9964,8 +9964,8 @@ bool QWidget::testAttribute_helper(Qt::WidgetAttribute attribute) const
 
   By default the value of this property is 1.0.
 
-  This feature is available on Embedded Linux, Mac OS X, X11 platforms that
-  support the Composite extension, and Windows 2000 and later.
+  This feature is available on Embedded Linux, Mac OS X, Windows,
+  and X11 platforms that support the Composite extension.
 
   This feature is not available on Windows CE.
 
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp
index e39ca771cf..dcf541c633 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/kernel/qwidget_win.cpp
@@ -140,14 +140,8 @@ static void init_wintab_functions()
     if (!qt_is_gui_used)
         return;
     QLibrary library(QLatin1String("wintab32"));
-    QT_WA({
-        ptrWTOpen = (PtrWTOpen)library.resolve("WTOpenW");
-        ptrWTInfo = (PtrWTInfo)library.resolve("WTInfoW");
-    } , {
-        ptrWTOpen = (PtrWTOpen)library.resolve("WTOpenA");
-        ptrWTInfo = (PtrWTInfo)library.resolve("WTInfoA");
-    });
-
+    ptrWTOpen = (PtrWTOpen)library.resolve("WTOpenW");
+    ptrWTInfo = (PtrWTInfo)library.resolve("WTInfoW");
     ptrWTClose = (PtrWTClose)library.resolve("WTClose");
     ptrWTQueueSizeGet = (PtrWTQueueSizeGet)library.resolve("WTQueueSizeGet");
     ptrWTQueueSizeSet = (PtrWTQueueSizeSet)library.resolve("WTQueueSizeSet");
@@ -287,25 +281,18 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
 
     if (desktop && !q->testAttribute(Qt::WA_DontShowOnScreen)) {                                // desktop widget
         popup = false;                                // force this flags off
-        if (QSysInfo::WindowsVersion != QSysInfo::WV_NT && QSysInfo::WindowsVersion != QSysInfo::WV_95)
-            data.crect.setRect(GetSystemMetrics(76 /* SM_XVIRTUALSCREEN  */), GetSystemMetrics(77 /* SM_YVIRTUALSCREEN  */),
+        data.crect.setRect(GetSystemMetrics(76 /* SM_XVIRTUALSCREEN  */), GetSystemMetrics(77 /* SM_YVIRTUALSCREEN  */),
                            GetSystemMetrics(78 /* SM_CXVIRTUALSCREEN */), GetSystemMetrics(79 /* SM_CYVIRTUALSCREEN */));
-        else
-            data.crect.setRect(0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
     }
 
     parentw = q->parentWidget() ? q->parentWidget()->effectiveWinId() : 0;
 
-#ifdef UNICODE
     QString title;
-    const TCHAR *ttitle = 0;
-#endif
-    QByteArray title95;
     int style = WS_CHILD;
     int exsty = 0;
 
     if (window) {
-        style = GetWindowLongA(window, GWL_STYLE);
+        style = GetWindowLong(window, GWL_STYLE);
         if (!style)
             qErrnoWarning("QWidget::create: GetWindowLong failed");
         topLevel = false; // #### needed for some IE plugins??
@@ -361,12 +348,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
     }
 
     if (flags & Qt::WindowTitleHint) {
-        QT_WA({
-            title = q->isWindow() ? qAppName() : q->objectName();
-            ttitle = (TCHAR*)title.utf16();
-        } , {
-            title95 = q->isWindow() ? qAppName().toLocal8Bit() : q->objectName().toLatin1();
-        });
+        title = q->isWindow() ? qAppName() : q->objectName();
     }
 
     // The Qt::WA_WState_Created flag is checked by translateConfigEvent() in
@@ -379,13 +361,13 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
             destroyw = data.winid;
         id = window;
         setWinId(window);
-        LONG res = SetWindowLongA(window, GWL_STYLE, style);
+        LONG res = SetWindowLong(window, GWL_STYLE, style);
         if (!res)
             qErrnoWarning("QWidget::create: Failed to set window style");
 #ifdef _WIN64
-        res = SetWindowLongPtrA( window, GWLP_WNDPROC, (LONG_PTR)QtWndProc );
+        res = SetWindowLongPtr( window, GWLP_WNDPROC, (LONG_PTR)QtWndProc );
 #else
-        res = SetWindowLongA( window, GWL_WNDPROC, (LONG)QtWndProc );
+        res = SetWindowLong( window, GWL_WNDPROC, (LONG)QtWndProc );
 #endif
         if (!res)
             qErrnoWarning("QWidget::create: Failed to set window procedure");
@@ -436,16 +418,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
             }
         }
 
-        QT_WA({
-            const TCHAR *cname = (TCHAR*)windowClassName.utf16();
-            id = CreateWindowEx(exsty, cname, ttitle, style,
-                                x, y, w, h,
-                                parentw, 0, appinst, 0);
-        } , {
-            id = CreateWindowExA(exsty, windowClassName.toLatin1(), title95, style,
-                                 x, y, w, h,
-                                 parentw, 0, appinst, 0);
-        });
+        id = CreateWindowEx(exsty, reinterpret_cast<const wchar_t *>(windowClassName.utf16()),
+                            reinterpret_cast<const wchar_t *>(title.utf16()), style,
+                            x, y, w, h,
+                            parentw, NULL, appinst, NULL);
         if (!id)
             qErrnoWarning("QWidget::create: Failed to create window");
         setWinId(id);
@@ -457,16 +433,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
             SetWindowPos(id, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
         winUpdateIsOpaque();
     } else if (q->testAttribute(Qt::WA_NativeWindow) || paintOnScreen()) { // create child widget
-        QT_WA({
-            const TCHAR *cname = (TCHAR*)windowClassName.utf16();
-            id = CreateWindowEx(exsty, cname, ttitle, style,
-                                data.crect.left(), data.crect.top(), data.crect.width(), data.crect.height(),
-                            parentw, NULL, appinst, NULL);
-        } , {
-            id = CreateWindowExA(exsty, windowClassName.toLatin1(), title95, style,
-                                 data.crect.left(), data.crect.top(), data.crect.width(), data.crect.height(),
+        id = CreateWindowEx(exsty, reinterpret_cast<const wchar_t *>(windowClassName.utf16()),
+                            reinterpret_cast<const wchar_t *>(title.utf16()), style,
+                            data.crect.left(), data.crect.top(), data.crect.width(), data.crect.height(),
                             parentw, NULL, appinst, NULL);
-        });
         if (!id)
             qErrnoWarning("QWidget::create: Failed to create window");
         SetWindowPos(id, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
@@ -682,7 +652,7 @@ void QWidgetPrivate::setParent_sys(QWidget *parent, Qt::WindowFlags f)
     // Show borderless toplevel windows in tasklist & NavBar
     if (!parent) {
         QString txt = q->windowTitle().isEmpty()?qAppName():q->windowTitle();
-        SetWindowText(q->internalWinId(), (TCHAR*)txt.utf16());
+        SetWindowText(q->internalWinId(), (wchar_t*)txt.utf16());
     }
 #endif
     invalidateBuffer(q->rect());
@@ -767,11 +737,7 @@ void QWidgetPrivate::setWindowTitle_sys(const QString &caption)
         return;
 
     Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
-    QT_WA({
-        SetWindowText(q->internalWinId(), (TCHAR*)caption.utf16());
-    } , {
-        SetWindowTextA(q->internalWinId(), caption.toLocal8Bit());
-    });
+    SetWindowText(q->internalWinId(), (wchar_t*)caption.utf16());
 }
 
 /*
@@ -853,11 +819,11 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
                                   GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON),
                                   &(x->iconPixmap));
     if (x->winIconBig) {
-        SendMessageA(q->internalWinId(), WM_SETICON, 0 /* ICON_SMALL */, (LPARAM)x->winIconSmall);
-        SendMessageA(q->internalWinId(), WM_SETICON, 1 /* ICON_BIG */, (LPARAM)x->winIconBig);
+        SendMessage(q->internalWinId(), WM_SETICON, 0 /* ICON_SMALL */, (LPARAM)x->winIconSmall);
+        SendMessage(q->internalWinId(), WM_SETICON, 1 /* ICON_BIG */, (LPARAM)x->winIconBig);
     } else {
-        SendMessageA(q->internalWinId(), WM_SETICON, 0 /* ICON_SMALL */, (LPARAM)x->winIconSmall);
-        SendMessageA(q->internalWinId(), WM_SETICON, 1 /* ICON_BIG */, (LPARAM)x->winIconSmall);
+        SendMessage(q->internalWinId(), WM_SETICON, 0 /* ICON_SMALL */, (LPARAM)x->winIconSmall);
+        SendMessage(q->internalWinId(), WM_SETICON, 1 /* ICON_BIG */, (LPARAM)x->winIconSmall);
     }
 }
 
@@ -884,7 +850,7 @@ LRESULT CALLBACK qJournalRecordProc(int nCode, WPARAM wParam, LPARAM lParam)
 /* Works only as long as pointer is inside the application's window,
    which is good enough for QDockWidget.
 
-   Doesn't call SetWindowsHookExA() - this function causes a system-wide
+   Doesn't call SetWindowsHookEx() - this function causes a system-wide
    freeze if any other app on the system installs a hook and fails to
    process events. */
 void QWidgetPrivate::grabMouseWhileInWindow()
@@ -908,7 +874,7 @@ void QWidget::grabMouse()
     if (!qt_nograb()) {
         if (mouseGrb)
             mouseGrb->releaseMouse();
-        journalRec = SetWindowsHookExA(WH_JOURNALRECORD, (HOOKPROC)qJournalRecordProc, GetModuleHandleA(0), 0);
+        journalRec = SetWindowsHookEx(WH_JOURNALRECORD, (HOOKPROC)qJournalRecordProc, GetModuleHandle(0), 0);
         Q_ASSERT(testAttribute(Qt::WA_WState_Created));
         SetCapture(effectiveWinId());
         mouseGrb = this;
@@ -921,7 +887,7 @@ void QWidget::grabMouse(const QCursor &cursor)
     if (!qt_nograb()) {
         if (mouseGrb)
             mouseGrb->releaseMouse();
-        journalRec = SetWindowsHookExA(WH_JOURNALRECORD, (HOOKPROC)qJournalRecordProc, GetModuleHandleA(0), 0);
+        journalRec = SetWindowsHookEx(WH_JOURNALRECORD, (HOOKPROC)qJournalRecordProc, GetModuleHandle(0), 0);
         Q_ASSERT(testAttribute(Qt::WA_WState_Created));
         SetCapture(effectiveWinId());
         mouseGrbCur = new QCursor(cursor);
@@ -1028,7 +994,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
             if (newstate & Qt::WindowFullScreen) {
                 if (d->topData()->normalGeometry.width() < 0 && !(oldstate & Qt::WindowMaximized))
                     d->topData()->normalGeometry = geometry();
-                d->topData()->savedFlags = Qt::WindowFlags(GetWindowLongA(internalWinId(), GWL_STYLE));
+                d->topData()->savedFlags = Qt::WindowFlags(GetWindowLong(internalWinId(), GWL_STYLE));
 #ifndef Q_FLATTEN_EXPOSE
                 UINT style = WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_POPUP;
 #else
@@ -1038,7 +1004,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
 		    style |= WS_SYSMENU;
                 if (isVisible())
                     style |= WS_VISIBLE;
-                SetWindowLongA(internalWinId(), GWL_STYLE, style);
+                SetWindowLong(internalWinId(), GWL_STYLE, style);
                 QRect r = QApplication::desktop()->screenGeometry(this);
                 UINT swpf = SWP_FRAMECHANGED;
                 if (newstate & Qt::WindowActive)
@@ -1050,7 +1016,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
                 UINT style = d->topData()->savedFlags;
                 if (isVisible())
                     style |= WS_VISIBLE;
-                SetWindowLongA(internalWinId(), GWL_STYLE, style);
+                SetWindowLong(internalWinId(), GWL_STYLE, style);
 
                 UINT swpf = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE;
                 if (newstate & Qt::WindowActive)
@@ -1395,7 +1361,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
             UINT style = top->savedFlags;
             if (q->isVisible())
                 style |= WS_VISIBLE;
-            SetWindowLongA(q->internalWinId(), GWL_STYLE, style);
+            SetWindowLong(q->internalWinId(), GWL_STYLE, style);
 
             UINT swpf = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE;
             if (data.window_state & Qt::WindowActive)
@@ -1410,7 +1376,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
     QTLWExtra *tlwExtra = q->window()->d_func()->maybeTopData();
     const bool inTopLevelResize = tlwExtra ? tlwExtra->inTopLevelResize : false;
     const bool isTranslucentWindow = !isOpaque && ptrUpdateLayeredWindowIndirect && (data.window_flags & Qt::FramelessWindowHint)
-                                     && GetWindowLongA(q->internalWinId(), GWL_EXSTYLE) & Q_WS_EX_LAYERED;
+                                     && GetWindowLong(q->internalWinId(), GWL_EXSTYLE) & Q_WS_EX_LAYERED;
 
     if (q->testAttribute(Qt::WA_WState_ConfigPending)) {        // processing config event
         if (q->internalWinId())
@@ -1578,11 +1544,11 @@ void QWidgetPrivate::winUpdateIsOpaque()
         return;
 
     if (!isOpaque && ptrUpdateLayeredWindowIndirect) {
-        SetWindowLongA(q->internalWinId(), GWL_EXSTYLE,
-            GetWindowLongA(q->internalWinId(), GWL_EXSTYLE) | Q_WS_EX_LAYERED);
+        SetWindowLong(q->internalWinId(), GWL_EXSTYLE,
+            GetWindowLong(q->internalWinId(), GWL_EXSTYLE) | Q_WS_EX_LAYERED);
     } else {
-        SetWindowLongA(q->internalWinId(), GWL_EXSTYLE,
-            GetWindowLongA(q->internalWinId(), GWL_EXSTYLE) & ~Q_WS_EX_LAYERED);
+        SetWindowLong(q->internalWinId(), GWL_EXSTYLE,
+            GetWindowLong(q->internalWinId(), GWL_EXSTYLE) & ~Q_WS_EX_LAYERED);
     }
 #endif
 }
@@ -1592,12 +1558,12 @@ void QWidgetPrivate::setConstraints_sys()
 #ifndef Q_WS_WINCE_WM
     Q_Q(QWidget);
     if (q->isWindow() && q->testAttribute(Qt::WA_WState_Created)) {
-        int style = GetWindowLongA(q->internalWinId(), GWL_STYLE);
+        int style = GetWindowLong(q->internalWinId(), GWL_STYLE);
         if (shouldShowMaximizeButton())
             style |= WS_MAXIMIZEBOX;
         else
             style &= ~WS_MAXIMIZEBOX;
-        SetWindowLongA(q->internalWinId(), GWL_STYLE, style);
+        SetWindowLong(q->internalWinId(), GWL_STYLE, style);
     }
 #endif
 }
@@ -1867,10 +1833,8 @@ void QWidgetPrivate::updateFrameStrut()
     RECT rect = {0,0,0,0};
 
     QTLWExtra *top = topData();
-    uint exstyle = QT_WA_INLINE(GetWindowLongW(q->internalWinId(), GWL_EXSTYLE),
-                                GetWindowLongA(q->internalWinId(), GWL_EXSTYLE));
-    uint style = QT_WA_INLINE(GetWindowLongW(q->internalWinId(), GWL_STYLE),
-                              GetWindowLongA(q->internalWinId(), GWL_STYLE));
+    uint exstyle = GetWindowLong(q->internalWinId(), GWL_EXSTYLE);
+    uint style = GetWindowLong(q->internalWinId(), GWL_STYLE);
 #ifndef Q_WS_WINCE
     if (AdjustWindowRectEx(&rect, style & ~(WS_OVERLAPPED), FALSE, exstyle)) {
 #else
@@ -1886,11 +1850,10 @@ void QWidgetPrivate::setWindowOpacity_sys(qreal level)
 {
     Q_Q(QWidget);
 
-    if (!isOpaque && ptrUpdateLayeredWindowIndirect && (data.window_flags & Qt::FramelessWindowHint)) {
-        if (GetWindowLongA(q->internalWinId(), GWL_EXSTYLE) & Q_WS_EX_LAYERED) {
-            Q_BLENDFUNCTION blend = {AC_SRC_OVER, 0, (int)(255.0 * level), Q_AC_SRC_ALPHA};
-                    Q_UPDATELAYEREDWINDOWINFO info = {sizeof(info), NULL, NULL, NULL, NULL, NULL, 0, &blend, Q_ULW_ALPHA, NULL};
-            (*ptrUpdateLayeredWindowIndirect)(q->internalWinId(), &info);
+    if (!isOpaque && ptrUpdateLayeredWindow && (data.window_flags & Qt::FramelessWindowHint)) {
+        if (GetWindowLong(q->internalWinId(), GWL_EXSTYLE) & Q_WS_EX_LAYERED) {
+            BLENDFUNCTION blend = {AC_SRC_OVER, 0, (int)(255.0 * level), AC_SRC_ALPHA};
+            ptrUpdateLayeredWindow(q->internalWinId(), NULL, NULL, NULL, NULL, NULL, 0, &blend, Q_ULW_ALPHA);
         }
         return;
     }
@@ -1906,15 +1869,15 @@ void QWidgetPrivate::setWindowOpacity_sys(qreal level)
     if (!ptrSetLayeredWindowAttributes)
         return;
 
-    int wl = GetWindowLongA(q->internalWinId(), GWL_EXSTYLE);
+    int wl = GetWindowLong(q->internalWinId(), GWL_EXSTYLE);
 
     if (level != 1.0) {
         if ((wl&Q_WS_EX_LAYERED) == 0)
-            SetWindowLongA(q->internalWinId(), GWL_EXSTYLE, wl|Q_WS_EX_LAYERED);
+            SetWindowLong(q->internalWinId(), GWL_EXSTYLE, wl | Q_WS_EX_LAYERED);
     } else if (wl&Q_WS_EX_LAYERED) {
-        SetWindowLongA(q->internalWinId(), GWL_EXSTYLE, wl & ~Q_WS_EX_LAYERED);
+        SetWindowLong(q->internalWinId(), GWL_EXSTYLE, wl & ~Q_WS_EX_LAYERED);
     }
-    (*ptrSetLayeredWindowAttributes)(q->internalWinId(), 0, (int)(level * 255), Q_LWA_ALPHA);
+    ptrSetLayeredWindowAttributes(q->internalWinId(), 0, (int)(level * 255), Q_LWA_ALPHA);
 }
 #endif //Q_WS_WINCE
 
diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/kernel/qwidget_wince.cpp
index 24d815615f..b0eaa125f2 100644
--- a/src/gui/kernel/qwidget_wince.cpp
+++ b/src/gui/kernel/qwidget_wince.cpp
@@ -188,11 +188,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
 
     parentw = q->parentWidget() ? q->parentWidget()->effectiveWinId() : 0;
 
-#ifdef UNICODE
     QString title;
-    const TCHAR *ttitle = 0;
-#endif
-    QByteArray title95;
     int style = WS_CHILD;
     int exsty = WS_EX_NOPARENTNOTIFY;
 
@@ -236,12 +232,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
     }
 
     if (flags & Qt::WindowTitleHint) {
-        QT_WA({
-            title = q->isWindow() ? qAppName() : q->objectName();
-            ttitle = (TCHAR*)title.utf16();
-        } , {
-            title95 = q->isWindow() ? qAppName().toLocal8Bit() : q->objectName().toLatin1();
-        });
+        title = q->isWindow() ? qAppName() : q->objectName();
     }
 
     // The Qt::WA_WState_Created flag is checked by translateConfigEvent() in
@@ -254,11 +245,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
             destroyw = data.winid;
         id = window;
         setWinId(window);
-        LONG res = SetWindowLongA(window, GWL_STYLE, style);
+        LONG res = SetWindowLong(window, GWL_STYLE, style);
         if (!res)
             qErrnoWarning("QWidget::create: Failed to set window style");
 
-        res = SetWindowLongA( window, GWL_WNDPROC, (LONG)QtWndProc );
+        res = SetWindowLong( window, GWL_WNDPROC, (LONG)QtWndProc );
 
         if (!res)
             qErrnoWarning("QWidget::create: Failed to set window procedure");
@@ -267,10 +258,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         if (!id) { //Create a dummy desktop
             RECT r;
             SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0);
-            const TCHAR *cname = reinterpret_cast<const TCHAR *> (windowClassName.utf16());
-            id = CreateWindow(cname, ttitle, style,
-                                r.left, r.top, r.right - r.left, r.bottom - r.top,
-                                0, 0, appinst, 0);
+            id = CreateWindow(reinterpret_cast<const wchar_t *>(windowClassName.utf16()),
+                              reinterpret_cast<const wchar_t *>(title.utf16()), style,
+                              r.left, r.top, r.right - r.left, r.bottom - r.top,
+                              0, 0, appinst, 0);
         }
         setWinId(id);
     } else if (topLevel) {                       // create top-level widget
@@ -303,8 +294,8 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
             }
         }
 
-        const TCHAR *cname = reinterpret_cast<const TCHAR *> (windowClassName.utf16());
-        id = CreateWindowEx(exsty, cname, ttitle, style,
+        id = CreateWindowEx(exsty, reinterpret_cast<const wchar_t *>(windowClassName.utf16()),
+                            reinterpret_cast<const wchar_t *>(title.utf16()), style,
                             x, y, w, h,
                             0, 0, appinst, 0);
 
@@ -314,16 +305,9 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         if ((flags & Qt::WindowStaysOnTopHint) || (type == Qt::ToolTip))
             SetWindowPos(id, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
     } else if (q->testAttribute(Qt::WA_NativeWindow) || paintOnScreen()) { // create child widget
-        QT_WA({
-            const TCHAR *cname = (TCHAR*)windowClassName.utf16();
-            id = CreateWindowEx(exsty, cname, ttitle, style,
-                                data.crect.left(), data.crect.top(), data.crect.width(), data.crect.height(),
-                            parentw, NULL, appinst, NULL);
-        } , {
-            id = CreateWindowExA(exsty, windowClassName.toLatin1(), title95, style,
-                                 data.crect.left(), data.crect.top(), data.crect.width(), data.crect.height(),
+        id = CreateWindowEx(exsty, (wchar_t*)windowClassName.utf16(), (wchar_t*)title.utf16(), style,
+                            data.crect.left(), data.crect.top(), data.crect.width(), data.crect.height(),
                             parentw, NULL, appinst, NULL);
-        });
         if (!id)
             qErrnoWarning("QWidget::create: Failed to create window");
         SetWindowPos(id, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
@@ -510,7 +494,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
         }
         if ((oldstate & Qt::WindowMaximized) != (newstate & Qt::WindowMaximized)) {
              if (!(newstate & Qt::WindowMaximized)) {
-                int style = GetWindowLongW(internalWinId(), GWL_STYLE) | WS_BORDER | WS_POPUP | WS_CAPTION;
+                int style = GetWindowLong(internalWinId(), GWL_STYLE) | WS_BORDER | WS_POPUP | WS_CAPTION;
                 SetWindowLong(internalWinId(), GWL_STYLE, style);
                 SetWindowLong(internalWinId(), GWL_EXSTYLE, GetWindowLong (internalWinId(), GWL_EXSTYLE) & ~ WS_EX_NODRAG);
             }
@@ -535,11 +519,11 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
             if (newstate & Qt::WindowFullScreen) {
                 if (d->topData()->normalGeometry.width() < 0 && !(oldstate & Qt::WindowMaximized))
                     d->topData()->normalGeometry = geometry();
-                d->topData()->savedFlags = (Qt::WindowFlags) GetWindowLongA(internalWinId(), GWL_STYLE);
+                d->topData()->savedFlags = (Qt::WindowFlags)GetWindowLong(internalWinId(), GWL_STYLE);
                 UINT style = WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_POPUP;
                 if (isVisible())
                     style |= WS_VISIBLE;
-                SetWindowLongA(internalWinId(), GWL_STYLE, style);
+                SetWindowLong(internalWinId(), GWL_STYLE, style);
                 QRect r = qApp->desktop()->screenGeometry(this);
                 UINT swpf = SWP_FRAMECHANGED;
                 if (newstate & Qt::WindowActive)
@@ -550,7 +534,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
                 UINT style = d->topData()->savedFlags;
                 if (isVisible())
                     style |= WS_VISIBLE;
-                SetWindowLongA(internalWinId(), GWL_STYLE, style);
+                SetWindowLong(internalWinId(), GWL_STYLE, style);
                 UINT swpf = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE;
                 if (newstate & Qt::WindowActive)
                     swpf |= SWP_NOACTIVATE;