pre-XP headers cleaned

git-svn-id: http://svn.miranda-ng.org/main/trunk@6183 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 6 insertions, 22 deletions

diff --git a/include/m_core.h b/include/m_core.h
index e7f7e4f919..93e97b1ba6 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -899,6 +899,11 @@ MIR_CORE_DLL(void)    KillModuleSubclassing(HMODULE hInst);
 

 ///////////////////////////////////////////////////////////////////////////////

 

+MIR_CORE_DLL(BOOL)    IsWinVerVistaPlus();

+MIR_CORE_DLL(BOOL)    IsWinVer7Plus();

+

+///////////////////////////////////////////////////////////////////////////////

+

 MIR_CORE_DLL(void) UnloadCoreModule(void);

 

 #if defined(__cplusplus)

diff --git a/include/win2k.h b/include/win2k.h
index d65f4a86f5..00db8cbb09 100644
--- a/include/win2k.h
+++ b/include/win2k.h
@@ -32,34 +32,13 @@ To make myself clear, you are supposed to use the sdk, this is just a work aroun
 

 All constants are normally declared in winuser.h

 

-File created by Christian Kästner, and tweaked a bit by Richard Hughes*/

+File created by Christian Kostner, and tweaked a bit by Richard Hughes*/

 

-//Windows versions in order of feature presence is:

-//95, NT4, 98, ME, 2000, XP

-//This is chronological order of release except for ME/2000. ME is barely an

-//improvement on 98.

-//These macros use the above order, not release order.

 #define WinVerMajor()      LOBYTE(LOWORD(GetVersion()))

 #define WinVerMinor()      HIBYTE(LOWORD(GetVersion()))

-#define IsWinVerNT()       ((GetVersion()&0x80000000) == 0)

-// IsWinVerNT4Plus() is buggy, Windows 98 is 4.10.1998

-#define IsWinVerNT4Plus()  (WinVerMajor()>=5 || WinVerMinor()>0 || IsWinVerNT())

-#define IsWinVer98Plus()   (LOWORD(GetVersion()) != 4)

-#define IsWinVerMEPlus()   (WinVerMajor()>=5 || WinVerMinor()>10)

-#define IsWinVer2000Plus() (WinVerMajor()>=5 && IsWinVerNT())

-#define IsWinVerXPPlus()   (WinVerMajor()>=5 && LOWORD(GetVersion()) != 5)

-#define IsWinVerVistaPlus() (WinVerMajor()>=6)

-#define IsWinVer7Plus()     (WinVerMajor()>6 || (WinVerMajor() == 6 && WinVerMinor()>=1))

 

 // put stuff that's not apart of any SDKs but is used nonetheless

 

-#ifdef _WIN64

-#define MENUITEMINFO_V4_SIZE sizeof(MENUITEMINFO)

-#else

-//mii was extended for NT5/Win98, so need the old length for some stuff

-#define MENUITEMINFO_V4_SIZE (offsetof(MENUITEMINFO, cch)+sizeof((*((MENUITEMINFO*)0)).cch))

-#endif

-

 #if _MSC_VER >= 1300

 #define NOWIN2K

 #endif