From d7513a5994c734ed48e95ec55d1abd9147c75405 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Fri, 11 Jun 2010 12:36:34 +0200
Subject: Changed the way we detect touch screen on Windows.

Instead of using the IInkTablets interface (which sometimes freezes in the
get_Count() call for 10 seconds), we just check if there is digitizer support.

Task-number: QTBUG-6007
Reviewed-by: Prasanth
(cherry picked from commit 7f338180e88b71e793069e2fbe9a70f3c434e126)
---
 src/gui/kernel/qapplication_win.cpp                | 36 +++-------------------
 .../kernel/qwinnativepangesturerecognizer_win_p.h  | 32 +++++++++++++++++++
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index cf28893..610dec5 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -118,8 +118,6 @@ extern void qt_wince_hide_taskbar(HWND hwnd); //defined in qguifunctions_wince.c
 #  include <winable.h>
 #endif
 
-#include "private/qwinnativepangesturerecognizer_win_p.h"
-
 #ifndef WM_TOUCH
 #  define WM_TOUCH 0x0240
 
@@ -4069,36 +4067,10 @@ PtrCloseTouchInputHandle QApplicationPrivate::CloseTouchInputHandle = 0;
 
 void QApplicationPrivate::initializeMultitouch_sys()
 {
-    static const IID QT_IID_IInkTablets = {0x112086D9, 0x7779, 0x4535, {0xA6, 0x99, 0x86, 0x2B, 0x43, 0xAC, 0x18, 0x63} };
-    static const IID QT_IID_IInkTablet2 = {0x90c91ad2, 0xfa36, 0x49d6, {0x95, 0x16, 0xce, 0x8d, 0x57, 0x0f, 0x6f, 0x85} };
-    static const CLSID QT_CLSID_InkTablets = {0x6E4FCB12, 0x510A, 0x4d40, {0x93, 0x04, 0x1D, 0xA1, 0x0A, 0xE9, 0x14, 0x7C} };
-
-    IInkTablets *iInkTablets = 0;
-    HRESULT hr = CoCreateInstance(QT_CLSID_InkTablets, NULL, CLSCTX_ALL, QT_IID_IInkTablets, (void**)&iInkTablets);
-    if (SUCCEEDED(hr)) {
-        long count = 0;
-        iInkTablets->get_Count(&count);
-        for (long i = 0; i < count; ++i) {
-            IInkTablet *iInkTablet = 0;
-            hr = iInkTablets->Item(i, &iInkTablet);
-            if (FAILED(hr))
-                continue;
-            IInkTablet2 *iInkTablet2 = 0;
-            hr = iInkTablet->QueryInterface(QT_IID_IInkTablet2, (void**)&iInkTablet2);
-            iInkTablet->Release();
-            if (FAILED(hr))
-                continue;
-            TabletDeviceKind kind;
-            hr = iInkTablet2->get_DeviceKind(&kind);
-            iInkTablet2->Release();
-            if (FAILED(hr))
-                continue;
-            if (kind == TDK_Touch) {
-                QApplicationPrivate::HasTouchSupport = true;
-                break;
-            }
-        }
-        iInkTablets->Release();
+    if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) {
+        static const int QT_SM_DIGITIZER = 94;
+        QApplicationPrivate::HasTouchSupport = GetSystemMetrics(QT_SM_DIGITIZER);
+        qDebug() << "QApplicationPrivate::HasTouchSupport " << QApplicationPrivate::HasTouchSupport;
     }
 
     QLibrary library(QLatin1String("user32"));
diff --git a/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h b/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h
index 64addeb..eb99b74 100644
--- a/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h
+++ b/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h
@@ -54,6 +54,38 @@
 //
 
 #include <QGestureRecognizer>
+#include <objbase.h>
+
+class IInkRectangle;
+class TabletHardwareCapabilities;
+class TabletPropertyMetricUnit;
+DECLARE_INTERFACE_(IInkTablet, IDispatch)
+{
+	STDMETHOD(get_Name)(THIS_ BSTR *Name) PURE;
+	STDMETHOD(get_PlugAndPlayId)(THIS_ BSTR *Id) PURE;
+	STDMETHOD(get_MaximumInputRectangle)(THIS_ IInkRectangle **Rectangle) PURE;
+	STDMETHOD(get_HardwareCapabilities)(THIS_ TabletHardwareCapabilities *Capabilities) PURE;
+	STDMETHOD(IsPacketPropertySupported)(THIS_ BSTR packetPropertyName) PURE;
+	STDMETHOD(GetPropertyMetrics)(THIS_ BSTR propertyName, long *Minimum, long *Maximum, TabletPropertyMetricUnit *Units, float *Resolution) PURE;
+};
+enum TabletDeviceKind
+{
+	TDK_Mouse = 0,
+	TDK_Pen   = 1,
+	TDK_Touch = 2
+};
+DECLARE_INTERFACE_(IInkTablet2, IDispatch)
+{
+	STDMETHOD(get_DeviceKind)(THIS_ TabletDeviceKind *Kind) PURE;
+};
+DECLARE_INTERFACE_(IInkTablets, IDispatch)
+{
+	STDMETHOD(get_Count)(THIS_ long *Count) PURE;
+	STDMETHOD(get__NewEnum)(THIS_ IUnknown **_NewEnum) PURE;
+	STDMETHOD(get_DefaultTablet)(THIS_ IInkTablet **DefaultTablet) PURE;
+	STDMETHOD(Item)(THIS_ long Index, IInkTablet **Tablet) PURE;
+	STDMETHOD(IsPacketPropertySupported)(THIS_ BSTR packetPropertyName, VARIANT_BOOL *Supported) PURE;
+};
 
 #include <objbase.h>
 
-- 
cgit v0.12