1 files changed, 31 insertions, 18 deletions
diff --git a/src/gui/kernel/qguifunctions_wince.cpp b/src/gui/kernel/qguifunctions_wince.cpp
index e4be9a3..c96919a 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,21 +247,40 @@ 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;
 }
 
+int qt_wince_get_build()
+{
+    OSVERSIONINFO osvi;
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+    if (GetVersionEx(&osvi)) {
+        return osvi.dwBuildNumber;
+    } 
+    return 0;
+}
+
+int qt_wince_get_version()
+{
+    OSVERSIONINFO osvi;
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+    if (GetVersionEx(&osvi)) {
+        return (osvi.dwMajorVersion * 10 + osvi.dwMinorVersion);
+    } 
+    return 0;
+}
+
+bool qt_wince_is_windows_mobile_65()
+{
+    return ((qt_wince_get_version() == 52) && (qt_wince_get_build() > 2000));
+}
+
 bool qt_wince_is_pocket_pc() {
     return qt_wince_is_platform(QString::fromLatin1("PocketPC"));
 }
@@ -316,8 +329,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);