Changeset 871 for trunk

Timestamp:

Jun 9, 2011, 8:17:01 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed application crashes if the xsystray API DLL could not be loaded.

File:

• trunk/src/gui/util/qsystemtrayicon_pm.cpp (modified) (2 diffs)

trunk/src/gui/util/qsystemtrayicon_pm.cpp

@@ -246 +246 @@
 }
 
+template <typename T>
+inline T AssignFromVoidPtr(T &var, void *val) { var = (T)val; return var; }
+
+static bool gotApis = false;
+
+static bool resolveApis()
+{
+    static bool tried = false;
+
+    if (!tried) {
+        tried = true;
+
+        do {
+            // link to the xsystray API DLL at runtime
+            QLibrary xsystray(QLatin1String("xsystray"));
+
+            #define R(f) if (AssignFromVoidPtr(f, xsystray.resolve(#f)) == NULL) break
+
+            R(xstQuerySysTrayVersion);
+            R(xstAddSysTrayIcon);
+            R(xstReplaceSysTrayIcon);
+            R(xstRemoveSysTrayIcon);
+            R(xstSetSysTrayIconToolTip);
+            R(xstQuerySysTrayIconRect);
+            R(xstShowSysTrayIconBalloon);
+            R(xstHideSysTrayIconBalloon);
+            R(xstGetSysTrayCreatedMsgId);
+            R(xstGetSysTrayMaxTextLen);
+
+            #undef R
+
+            // initialize some constants
+            WM_XST_CREATED = xstGetSysTrayCreatedMsgId();
+            MaxTextLen = xstGetSysTrayMaxTextLen();
+
+            gotApis = true;
+
+        } while (0);
+    }
+
+    return gotApis;
+}
+
 void QSystemTrayIconPrivate::install_sys()
 {
+    if (!gotApis && !resolveApis())
+        return;
+
     Q_Q(QSystemTrayIcon);
     if (!sys) {
@@ -308 +354 @@
 }
 
-template <typename T>
-inline T AssignFromVoidPtr(T &var, void *val) { var = (T)val; return var; }
-
 bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
 {
-    static bool tried = false;
-    if (!tried) {
-        tried = true;
-
-        // link to the xsystray DLL at runtime
-        QLibrary xsystray(QLatin1String("xsystray"));
-
-        #define R(f) if (AssignFromVoidPtr(f, xsystray.resolve(#f)) == NULL) return false
-
-        R(xstQuerySysTrayVersion);
-        R(xstAddSysTrayIcon);
-        R(xstReplaceSysTrayIcon);
-        R(xstRemoveSysTrayIcon);
-        R(xstSetSysTrayIconToolTip);
-        R(xstQuerySysTrayIconRect);
-        R(xstShowSysTrayIconBalloon);
-        R(xstHideSysTrayIconBalloon);
-        R(xstGetSysTrayCreatedMsgId);
-        R(xstGetSysTrayMaxTextLen);
-
-        #undef R
-
-        // initialize some constants
-        WM_XST_CREATED = xstGetSysTrayCreatedMsgId();
-        MaxTextLen = xstGetSysTrayMaxTextLen();
-    }
-
+    if (!gotApis && !resolveApis())
+        return false;
     return xstQuerySysTrayVersion(0, 0, 0);
 }