Fixed audio notifications and taskbar icon hiding. NB! _qt_5_3_0_patch changed, Qt rebuild (nmake) required!

Telegram/Setup.iss

@@ -3,9 +3,9 @@
 
 #define MyAppShortName "Telegram"
 #define MyAppName "Telegram Win (Unofficial)"
-#define MyAppVersion "0.5"
+#define MyAppVersion "0.5.1"
-#define MyAppVersionZero "0.5.0"
+#define MyAppVersionZero "0.5.1"
-#define MyAppFullVersion "0.5.0.0"
+#define MyAppFullVersion "0.5.1.0"
 #define MyAppPublisher "Telegram (Unofficial)"
 #define MyAppURL "https://tdesktop.com"
 #define MyAppExeName "Telegram.exe"

Telegram/SourceFiles/config.h

@@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 */
 #pragma once
 
-static const int32 AppVersion = 5000;
+static const int32 AppVersion = 5001;
-static const wchar_t *AppVersionStr = L"0.5.0";
+static const wchar_t *AppVersionStr = L"0.5.1";
 static const wchar_t *AppName = L"Telegram Win (Unofficial)";
 static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}";
 

Telegram/SourceFiles/stdafx.cpp

@@ -20,5 +20,6 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 
 #ifdef Q_OS_WIN
 Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+Q_IMPORT_PLUGIN(QWindowsAudioPlugin)
 Q_IMPORT_PLUGIN(AccessibleFactory)
 #endif

Telegram/Telegram.vcxproj

@@ -79,7 +79,7 @@
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>.\..\..\Libraries\lzma\C\Util\LzmaLib\Debug;.\..\..\Libraries\libexif-0.6.20\win32\Debug;.\..\..\Libraries\zlib-1.2.8\contrib\vstudio\vc11\x86\ZlibStatDebug;.\..\..\Libraries\OpenSSL-Win32\lib\VC\static;$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;qtmaind.lib;glu32.lib;opengl32.lib;Strmiids.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5Multimediad.lib;Qt5PlatformSupportd.lib;platforms\qwindowsd.lib;accessible\qtaccessiblewidgetsd.lib;libeay32MTd.lib;zlibstat.lib;LzmaLib.lib;lib_exif.lib;UxTheme.lib;DbgHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;qtmaind.lib;glu32.lib;opengl32.lib;Strmiids.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5Multimediad.lib;Qt5PlatformSupportd.lib;platforms\qwindowsd.lib;accessible\qtaccessiblewidgetsd.lib;audio\qtaudio_windowsd.lib;libeay32MTd.lib;zlibstat.lib;LzmaLib.lib;lib_exif.lib;UxTheme.lib;DbgHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ImageHasSafeExceptionHandlers />
       <IgnoreSpecificDefaultLibraries>
@@ -108,7 +108,7 @@
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>.\..\..\Libraries\lzma\C\Util\LzmaLib\Release;.\..\..\Libraries\libexif-0.6.20\win32\Release;.\..\..\Libraries\zlib-1.2.8\contrib\vstudio\vc11\x86\ZlibStatRelease;.\..\..\Libraries\OpenSSL-Win32\lib\VC\static;$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;qtmain.lib;glu32.lib;opengl32.lib;Strmiids.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Network.lib;Qt5Multimedia.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;accessible\qtaccessiblewidgets.lib;libeay32MT.lib;zlibstat.lib;lib_exif.lib;UxTheme.lib;DbgHelp.lib;LzmaLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;qtmain.lib;glu32.lib;opengl32.lib;Strmiids.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Network.lib;Qt5Multimedia.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;accessible\qtaccessiblewidgets.lib;audio\qtaudio_windows.lib;libeay32MT.lib;zlibstat.lib;lib_exif.lib;UxTheme.lib;DbgHelp.lib;LzmaLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImageHasSafeExceptionHandlers />
       <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)Intermediate\$(TargetName).lib</ImportLibrary>
       <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
@@ -135,7 +135,7 @@
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <AdditionalLibraryDirectories>.\..\..\Libraries\lzma\C\Util\LzmaLib\Release;.\..\..\Libraries\libexif-0.6.20\win32\Release;.\..\..\Libraries\zlib-1.2.8\contrib\vstudio\vc11\x86\ZlibStatRelease;.\..\..\Libraries\OpenSSL-Win32\lib\VC\static;$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;qtmain.lib;glu32.lib;opengl32.lib;Strmiids.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Network.lib;Qt5Multimedia.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;accessible\qtaccessiblewidgets.lib;libeay32MT.lib;zlibstat.lib;lib_exif.lib;UxTheme.lib;DbgHelp.lib;LzmaLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;qtmain.lib;glu32.lib;opengl32.lib;Strmiids.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Network.lib;Qt5Multimedia.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;accessible\qtaccessiblewidgets.lib;audio\qtaudio_windows.lib;libeay32MT.lib;zlibstat.lib;lib_exif.lib;UxTheme.lib;DbgHelp.lib;LzmaLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImageHasSafeExceptionHandlers>
       </ImageHasSafeExceptionHandlers>
       <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)Intermediate\$(TargetName).lib</ImportLibrary>

Telegram/_qt_5_3_0_patch/qtbase/src/plugins/platforms/windows/qwindowswindow.h

@@ -0,0 +1,398 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWINDOWSWINDOW_H
+#define QWINDOWSWINDOW_H
+
+#include "qtwindows_additional.h"
+#ifdef Q_OS_WINCE
+#  include "qplatformfunctions_wince.h"
+#endif
+#include "qwindowscursor.h"
+
+#include <qpa/qplatformwindow.h>
+
+#if defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)
+#  include <QtCore/QSharedPointer>
+#  include <EGL/egl.h>
+#endif
+
+QT_BEGIN_NAMESPACE
+
+class QWindowsOleDropTarget;
+class QDebug;
+
+#if defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)
+class QWindowsEGLStaticContext;
+#endif
+
+struct QWindowsGeometryHint
+{
+    QWindowsGeometryHint() {}
+    explicit QWindowsGeometryHint(const QWindow *w, const QMargins &customMargins);
+    static QMargins frame(DWORD style, DWORD exStyle);
+    static bool handleCalculateSize(const QMargins &customMargins, const MSG &msg, LRESULT *result);
+#ifndef Q_OS_WINCE //MinMax maybe define struct if not available
+    void applyToMinMaxInfo(DWORD style, DWORD exStyle, MINMAXINFO *mmi) const;
+    void applyToMinMaxInfo(HWND hwnd, MINMAXINFO *mmi) const;
+#endif
+    bool validSize(const QSize &s) const;
+
+    static inline QPoint mapToGlobal(HWND hwnd, const QPoint &);
+    static inline QPoint mapToGlobal(const QWindow *w, const QPoint &);
+    static inline QPoint mapFromGlobal(const HWND hwnd, const QPoint &);
+    static inline QPoint mapFromGlobal(const QWindow *w, const QPoint &);
+
+    static bool positionIncludesFrame(const QWindow *w);
+
+    QSize minimumSize;
+    QSize maximumSize;
+    QMargins customMargins;
+};
+
+struct QWindowCreationContext
+{
+    QWindowCreationContext(const QWindow *w, const QRect &r,
+                           const QMargins &customMargins,
+                           DWORD style, DWORD exStyle);
+#ifndef Q_OS_WINCE //MinMax maybe define struct if not available
+    void applyToMinMaxInfo(MINMAXINFO *mmi) const
+        { geometryHint.applyToMinMaxInfo(style, exStyle, mmi); }
+#endif
+
+    QWindowsGeometryHint geometryHint;
+    DWORD style;
+    DWORD exStyle;
+    QRect requestedGeometry;
+    QRect obtainedGeometry;
+    QMargins margins;
+    QMargins customMargins;  // User-defined, additional frame for WM_NCCALCSIZE
+    int frameX; // Passed on to CreateWindowEx(), including frame.
+    int frameY;
+    int frameWidth;
+    int frameHeight;
+};
+
+struct QWindowsWindowData
+{
+    QWindowsWindowData() : hwnd(0), embedded(false) {}
+
+    Qt::WindowFlags flags;
+    QRect geometry;
+    QMargins frame; // Do not use directly for windows, see FrameDirty.
+    QMargins customMargins; // User-defined, additional frame for NCCALCSIZE
+    HWND hwnd;
+    bool embedded;
+
+    static QWindowsWindowData create(const QWindow *w,
+                                     const QWindowsWindowData &parameters,
+                                     const QString &title);
+};
+
+class QWindowsWindow : public QPlatformWindow
+{
+public:
+#if defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)
+    typedef QSharedPointer<QWindowsEGLStaticContext> QWindowsEGLStaticContextPtr;
+#endif
+
+    enum Flags
+    {
+        AutoMouseCapture = 0x1, //! Automatic mouse capture on button press.
+        WithinSetParent = 0x2,
+        FrameDirty = 0x4,            //! Frame outdated by setStyle, recalculate in next query.
+        OpenGLSurface = 0x10,
+        OpenGL_ES2 = 0x20,
+        OpenGLDoubleBuffered = 0x40,
+        OpenGlPixelFormatInitialized = 0x80,
+        BlockedByModal = 0x100,
+        SizeGripOperation = 0x200,
+        FrameStrutEventsEnabled = 0x400,
+        SynchronousGeometryChangeEvent = 0x800,
+        WithinSetStyle = 0x1000,
+        WithinDestroy = 0x2000,
+        TouchRegistered = 0x4000,
+        AlertState = 0x8000,
+        Exposed = 0x10000,
+        WithinCreate = 0x20000,
+        WithinMaximize = 0x40000,
+        MaximizeToFullScreen = 0x80000
+    };
+
+    QWindowsWindow(QWindow *window, const QWindowsWindowData &data);
+    ~QWindowsWindow();
+
+    virtual QSurfaceFormat format() const { return m_format; }
+    virtual void setGeometry(const QRect &rect);
+    virtual QRect geometry() const { return m_data.geometry; }
+    QRect normalGeometry() const Q_DECL_OVERRIDE;
+
+    virtual void setVisible(bool visible);
+    bool isVisible() const;
+    virtual bool isExposed() const { return testFlag(Exposed); }
+    virtual bool isActive() const;
+    virtual bool isEmbedded(const QPlatformWindow *parentWindow) const;
+    virtual QPoint mapToGlobal(const QPoint &pos) const;
+    virtual QPoint mapFromGlobal(const QPoint &pos) const;
+
+    virtual void setWindowFlags(Qt::WindowFlags flags);
+    virtual void setWindowState(Qt::WindowState state);
+
+    HWND handle() const { return m_data.hwnd; }
+
+    virtual WId winId() const { return WId(m_data.hwnd); }
+    virtual void setParent(const QPlatformWindow *window);
+
+    virtual void setWindowTitle(const QString &title);
+    virtual void raise();
+    virtual void lower();
+
+    void windowEvent(QEvent *event);
+
+    virtual void propagateSizeHints();
+    virtual QMargins frameMargins() const;
+
+    virtual void setOpacity(qreal level);
+    virtual void setMask(const QRegion &region);
+    qreal opacity() const { return m_opacity; }
+    virtual void requestActivateWindow();
+
+    virtual bool setKeyboardGrabEnabled(bool grab);
+    virtual bool setMouseGrabEnabled(bool grab);
+    inline bool hasMouseCapture() const { return GetCapture() == m_data.hwnd; }
+
+    virtual bool startSystemResize(const QPoint &pos, Qt::Corner corner);
+
+    void setFrameStrutEventsEnabled(bool enabled);
+    bool frameStrutEventsEnabled() const { return testFlag(FrameStrutEventsEnabled); }
+
+    QMargins customMargins() const { return m_data.customMargins; }
+    void setCustomMargins(const QMargins &m);
+
+#if defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)
+    EGLSurface eglSurfaceHandle() const { return m_eglSurface;}
+    EGLSurface ensureEglSurfaceHandle(const QWindowsEGLStaticContextPtr &staticContext, EGLConfig config);
+#endif
+
+    inline unsigned style() const
+        { return GetWindowLongPtr(m_data.hwnd, GWL_STYLE); }
+    void setStyle(unsigned s) const;
+    inline unsigned exStyle() const
+        { return GetWindowLongPtr(m_data.hwnd, GWL_EXSTYLE); }
+    void setExStyle(unsigned s) const;
+
+    bool handleWmPaint(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
+
+    void handleMoved();
+    void handleResized(int wParam);
+    void handleHidden();
+    void handleCompositionSettingsChanged();
+
+    static inline HWND handleOf(const QWindow *w);
+    static inline QWindowsWindow *baseWindowOf(const QWindow *w);
+    static QWindow *topLevelOf(QWindow *w);
+    static inline void *userDataOf(HWND hwnd);
+    static inline void setUserDataOf(HWND hwnd, void *ud);
+
+    static bool setWindowLayered(HWND hwnd, Qt::WindowFlags flags, bool hasAlpha, qreal opacity);
+    bool isLayered() const;
+
+    HDC getDC();
+    void releaseDC();
+#ifndef Q_OS_WINCE // maybe available on some SDKs revisit WM_GETMINMAXINFO
+    void getSizeHints(MINMAXINFO *mmi) const;
+    bool handleNonClientHitTest(const QPoint &globalPos, LRESULT *result) const;
+#endif // !Q_OS_WINCE
+
+#ifndef QT_NO_CURSOR
+    QWindowsWindowCursor cursor() const { return m_cursor; }
+#endif
+    void setCursor(const QWindowsWindowCursor &c);
+    void applyCursor();
+
+    QWindowsWindow *childAt(const QPoint &clientPoint,
+                                unsigned cwexflags = CWP_SKIPINVISIBLE) const;
+    QWindowsWindow *childAtScreenPoint(const QPoint &screenPoint,
+                                           unsigned cwexflags = CWP_SKIPINVISIBLE) const;
+
+    static QByteArray debugWindowFlags(Qt::WindowFlags wf);
+
+    inline bool testFlag(unsigned f) const  { return (m_flags & f) != 0; }
+    inline void setFlag(unsigned f) const   { m_flags |= f; }
+    inline void clearFlag(unsigned f) const { m_flags &= ~f; }
+
+    void setEnabled(bool enabled);
+    bool isEnabled() const;
+    void setWindowIcon(const QIcon &icon);
+
+#ifndef Q_OS_WINCE
+    void setAlertState(bool enabled);
+    bool isAlertState() const { return testFlag(AlertState); }
+    void alertWindow(int durationMs = 0);
+    void stopAlertWindow();
+#endif
+
+private:
+    inline void show_sys() const;
+    inline void hide_sys() const;
+    inline void setGeometry_sys(const QRect &rect) const;
+    inline QRect frameGeometry_sys() const;
+    inline QRect geometry_sys() const;
+    inline QWindowsWindowData setWindowFlags_sys(Qt::WindowFlags wt, unsigned flags = 0) const;
+    inline bool isFullScreen_sys() const;
+    inline void setWindowState_sys(Qt::WindowState newState);
+    inline void setParent_sys(const QPlatformWindow *parent);
+    inline void updateTransientParent() const;
+	inline void clearTransientParent() const;
+	void destroyWindow();
+    inline bool isDropSiteEnabled() const { return m_dropTarget != 0; }
+    void setDropSiteEnabled(bool enabled);
+    void updateDropSite();
+    void handleGeometryChange();
+    void handleWindowStateChange(Qt::WindowState state);
+    inline void destroyIcon();
+    void fireExpose(const QRegion &region, bool force=false);
+
+    mutable QWindowsWindowData m_data;
+    mutable unsigned m_flags;
+    HDC m_hdc;
+    Qt::WindowState m_windowState;
+    qreal m_opacity;
+#ifndef QT_NO_CURSOR
+    QWindowsWindowCursor m_cursor;
+#endif
+    QWindowsOleDropTarget *m_dropTarget;
+    unsigned m_savedStyle;
+    QRect m_savedFrameGeometry;
+    const QSurfaceFormat m_format;
+#if defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC)
+    EGLSurface m_eglSurface;
+    QSharedPointer<QWindowsEGLStaticContext> m_staticEglContext;
+#endif
+#ifdef Q_OS_WINCE
+    bool m_previouslyHidden;
+#endif
+    HICON m_iconSmall;
+    HICON m_iconBig;
+};
+
+// Debug
+QDebug operator<<(QDebug d, const RECT &r);
+#ifndef Q_OS_WINCE // maybe available on some SDKs revisit WM_GETMINMAXINFO/WM_NCCALCSIZE
+QDebug operator<<(QDebug d, const MINMAXINFO &i);
+QDebug operator<<(QDebug d, const NCCALCSIZE_PARAMS &p);
+#endif
+
+// ---------- QWindowsGeometryHint inline functions.
+QPoint QWindowsGeometryHint::mapToGlobal(HWND hwnd, const QPoint &qp)
+{
+    POINT p = { qp.x(), qp.y() };
+    ClientToScreen(hwnd, &p);
+    return QPoint(p.x, p.y);
+}
+
+QPoint QWindowsGeometryHint::mapFromGlobal(const HWND hwnd, const QPoint &qp)
+{
+    POINT p = { qp.x(), qp.y() };
+    ScreenToClient(hwnd, &p);
+    return QPoint(p.x, p.y);
+}
+
+QPoint QWindowsGeometryHint::mapToGlobal(const QWindow *w, const QPoint &p)
+    { return QWindowsGeometryHint::mapToGlobal(QWindowsWindow::handleOf(w), p); }
+
+QPoint QWindowsGeometryHint::mapFromGlobal(const QWindow *w, const QPoint &p)
+    { return QWindowsGeometryHint::mapFromGlobal(QWindowsWindow::handleOf(w), p); }
+
+
+// ---------- QWindowsBaseWindow inline functions.
+
+QWindowsWindow *QWindowsWindow::baseWindowOf(const QWindow *w)
+{
+    if (w)
+        if (QPlatformWindow *pw = w->handle())
+            return static_cast<QWindowsWindow *>(pw);
+    return 0;
+}
+
+HWND QWindowsWindow::handleOf(const QWindow *w)
+{
+    if (const QWindowsWindow *bw = QWindowsWindow::baseWindowOf(w))
+        return bw->handle();
+    return 0;
+}
+
+void *QWindowsWindow::userDataOf(HWND hwnd)
+{
+    return (void *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+}
+
+void QWindowsWindow::setUserDataOf(HWND hwnd, void *ud)
+{
+    SetWindowLongPtr(hwnd, GWLP_USERDATA, LONG_PTR(ud));
+}
+
+inline void QWindowsWindow::destroyIcon()
+{
+    if (m_iconBig) {
+        DestroyIcon(m_iconBig);
+        m_iconBig = 0;
+    }
+    if (m_iconSmall) {
+        DestroyIcon(m_iconSmall);
+        m_iconSmall = 0;
+    }
+}
+
+inline bool QWindowsWindow::isLayered() const
+{
+#ifndef Q_OS_WINCE
+    return GetWindowLongPtr(m_data.hwnd, GWL_EXSTYLE) & WS_EX_LAYERED;
+#else
+    return false;
+#endif
+}
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QMargins)
+
+#endif // QWINDOWSWINDOW_H