From b920f268e8f03e4857485df9dcdbf001409c8c40 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Wed, 26 Aug 2009 14:27:31 +0200
Subject: reverting the definition of WINVER and _WIN32_WINNT in qglobal.h

This just caused too much problems and must be solved another way.
In qfsfileengine_win.cpp we define FSCTL_GET_REPARSE_POINT and all
of the other stuff that's needed for NTFS symlink support, if
its not defined. This is the case if _WIN32_WINNT is less
than 0x0500.
All other changes in this commit are just reversions of commits
that were done for the infamous qglobal.h change.

Discussed with prasanth, tested by pulse.
---
 src/corelib/global/qglobal.h         | 9 ---------
 src/corelib/io/qfsfileengine_win.cpp | 3 +++
 src/corelib/thread/qthread_win.cpp   | 4 ++++
 src/gui/util/qsystemtrayicon_win.cpp | 9 +++++----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index d22a863..93cc30f 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -265,15 +265,6 @@ namespace QT_NAMESPACE {}
 #  define Q_OS_WIN
 #endif
 
-#if defined(Q_OS_WIN32)
-#  ifndef WINVER
-#    define WINVER 0x0500
-#  endif
-#  ifndef _WIN32_WINNT
-#    define _WIN32_WINNT 0x0500
-#  endif
-#endif
-
 #if defined(Q_OS_DARWIN)
 #  define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */
 #  define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index e1fc804..4e142a9 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -123,6 +123,9 @@ typedef struct _REPARSE_DATA_BUFFER {
 #  ifndef IO_REPARSE_TAG_SYMLINK
 #    define IO_REPARSE_TAG_SYMLINK (0xA000000CL)
 #  endif
+#  ifndef FSCTL_GET_REPARSE_POINT
+#    define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#  endif
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index 82b462e..12ee413 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -39,6 +39,10 @@
 **
 ****************************************************************************/
 
+//#define WINVER 0x0500
+#define _WIN32_WINNT 0x0400
+
+
 #include "qthread.h"
 #include "qthread_p.h"
 #include "qthreadstorage.h"
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp
index 465c1d8..ea7fbde 100644
--- a/src/gui/util/qsystemtrayicon_win.cpp
+++ b/src/gui/util/qsystemtrayicon_win.cpp
@@ -132,11 +132,12 @@ QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *object)
     : hIcon(0), q(object), ignoreNextMouseRelease(false)
 
 {
-    notifyIconSize = sizeof(NOTIFYICONDATA);
-#ifdef Q_OS_WINCE
-    maxTipLength = 64;
-#else
+#ifndef Q_OS_WINCE
+    notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, guidItem); // NOTIFYICONDATAW_V2_SIZE;
     maxTipLength = 128;
+#else
+    notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, szTip[64]); // NOTIFYICONDATAW_V1_SIZE;
+    maxTipLength = 64;
 #endif
 
     // For restoring the tray icon after explorer crashes
-- 
cgit v0.12