From 6677ac4bc0b577322ff4529b5aad9670bd23aec9 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 21 Aug 2003 21:32:48 +0000
Subject: [PATCH] Removed a few remaining WINVER checks.

---
 include/imm.h      | 20 +-------------------
 include/ras.h      | 19 +++----------------
 include/windowsx.h |  3 ---
 3 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/include/imm.h b/include/imm.h
index 937a1182e52..2269258a639 100644
--- a/include/imm.h
+++ b/include/imm.h
@@ -68,8 +68,6 @@ typedef struct tagSTYLEBUFW
 DECL_WINELIB_TYPE_AW(STYLEBUF)
 DECL_WINELIB_TYPE_AW(LPSTYLEBUF)
 
-#if	(WINVER >= 0x040A)
-
 typedef struct tagRECONVERTSTRING
 {
 	DWORD	dwSize;
@@ -114,8 +112,6 @@ typedef struct tagIMEMENUITEMINFOW
 DECL_WINELIB_TYPE_AW(IMEMENUITEMINFO)
 DECL_WINELIB_TYPE_AW(LPIMEMENUITEMINFO)
 
-#endif	/* WINVER >= 0x040A */
-
 
 typedef struct _tagCOMPOSITIONFORM
 {
@@ -385,8 +381,6 @@ typedef struct _tagCOMPOSITIONFORM
 #define IMN_PRIVATE                     0x000E
 
 
-#if	(WINVER >= 0x040A)
-
 /* wParam of report message WM_IME_REQUEST */
 #define IMR_COMPOSITIONWINDOW		0x0001
 #define IMR_CANDIDATEWINDOW		0x0002
@@ -394,8 +388,6 @@ typedef struct _tagCOMPOSITIONFORM
 #define IMR_RECONVERTSTRING		0x0004
 #define IMR_CONFIRMRECONVERTSTRING	0x0005
 
-#endif	/* WINVER >= 0x040A */
-
 
 /* error code of ImmGetCompositionString */
 #define IMM_ERROR_NODATA                (-1)
@@ -431,8 +423,6 @@ typedef struct _tagCOMPOSITIONFORM
 #define IME_REGWORD_STYLE_USER_LAST     0xFFFFFFFF
 
 
-#if	(WINVER >= 0x040A)
-
 /* dwFlags for ImmAssociateContextEx */
 #define IACE_CHILDREN			0x0001
 #define IACE_DEFAULT			0x0010
@@ -465,9 +455,6 @@ typedef struct _tagCOMPOSITIONFORM
 #define IMFS_UNHILITE			MFS_UNHILITE
 #define IMFS_DEFAULT			MFS_DEFAULT
 
-#endif	/* WINVER >= 0x040A */
-
-
 
 /*
  * type of soft keyboard
@@ -479,6 +466,7 @@ typedef struct _tagCOMPOSITIONFORM
 
 
 HIMC   WINAPI ImmAssociateContext(HWND, HIMC);
+BOOL   WINAPI ImmAssociateContextEx(HWND, HIMC, DWORD);
 BOOL   WINAPI ImmConfigureIMEA(HKL, HWND, DWORD, LPVOID);
 BOOL   WINAPI ImmConfigureIMEW(HKL, HWND, DWORD, LPVOID);
 #define  ImmConfigureIME WINELIB_NAME_AW(ImmConfigureIME)
@@ -555,12 +543,6 @@ BOOL   WINAPI ImmUnregisterWordA(HKL, LPCSTR, DWORD, LPCSTR);
 BOOL   WINAPI ImmUnregisterWordW(HKL, LPCWSTR, DWORD, LPCWSTR);
 #define  ImmUnregisterWord WINELIB_NAME_AW(ImmUnregisterWord)
 
-#if	(WINVER >= 0x040A)
-
-BOOL   WINAPI ImmAssociateContextEx(HWND, HIMC, DWORD);
-
-#endif	/* WINVER >= 0x040A */
-
 
 #ifdef __cplusplus
 }
diff --git a/include/ras.h b/include/ras.h
index af0061dcc50..dde22fec76a 100644
--- a/include/ras.h
+++ b/include/ras.h
@@ -37,6 +37,7 @@ extern "C" {
 #define RAS_MaxX25Address     200
 #define RAS_MaxFacilities     200
 #define RAS_MaxUserData       200
+#define RAS_MaxDnsSuffix      256
 
 DECLARE_HANDLE(HRASCONN);
 
@@ -193,8 +194,6 @@ typedef struct tagRASENTRYA {
     DWORD dwReserved1;
     DWORD dwReserved2;
 
-#if (WINVER >= 0x401)
-
     /* Multilink and BAP */
 
     DWORD dwSubEntries;
@@ -207,17 +206,13 @@ typedef struct tagRASENTRYA {
     /* Idle time out */
     DWORD dwIdleDisconnectSeconds;
 
-#endif
-#if (WINVER >= 0x500)
-
     DWORD dwType;		/* entry type */
     DWORD dwEncryptionType;	/* type of encryption to use */
     DWORD dwCustomAuthKey;	/* authentication key for EAP */
     GUID guidId;		/* guid that represents the phone-book entry  */
     CHAR szCustomDialDll[MAX_PATH];    /* DLL for custom dialing  */
     DWORD dwVpnStrategy;         /* specifies type of VPN protocol */
-#endif
-#if (WINVER >= 0x501)
+
     DWORD dwfOptions2;
     DWORD dwfOptions3;
     CHAR szDnsSuffix[RAS_MaxDnsSuffix];
@@ -226,7 +221,6 @@ typedef struct tagRASENTRYA {
     CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1];
     DWORD dwRedialCount;
     DWORD dwRedialPause;
-#endif
 } RASENTRYA, *LPRASENTRYA;
 
 typedef struct tagRASENTRYW {
@@ -274,8 +268,6 @@ typedef struct tagRASENTRYW {
     DWORD dwReserved1;
     DWORD dwReserved2;
 
-#if (WINVER >= 0x401)
-
     /* Multilink and BAP */
 
     DWORD dwSubEntries;
@@ -288,17 +280,13 @@ typedef struct tagRASENTRYW {
     /* Idle time out */
     DWORD dwIdleDisconnectSeconds;
 
-#endif
-#if (WINVER >= 0x500)
-
     DWORD dwType;		/* entry type */
     DWORD dwEncryptionType;	/* type of encryption to use */
     DWORD dwCustomAuthKey;	/* authentication key for EAP */
     GUID guidId;		/* guid that represents the phone-book entry  */
     WCHAR szCustomDialDll[MAX_PATH];    /* DLL for custom dialing  */
     DWORD dwVpnStrategy;         /* specifies type of VPN protocol */
-#endif
-#if (WINVER >= 0x501)
+
     DWORD dwfOptions2;
     DWORD dwfOptions3;
     WCHAR szDnsSuffix[RAS_MaxDnsSuffix];
@@ -307,7 +295,6 @@ typedef struct tagRASENTRYW {
     WCHAR szPrerequisiteEntry[RAS_MaxEntryName + 1];
     DWORD dwRedialCount;
     DWORD dwRedialPause;
-#endif
 } RASENTRYW, *LPRASENTRYW;
 
 DECL_WINELIB_TYPE_AW(RASENTRY)
diff --git a/include/windowsx.h b/include/windowsx.h
index 545d081ea46..dc7c01f733d 100644
--- a/include/windowsx.h
+++ b/include/windowsx.h
@@ -1308,13 +1308,11 @@ extern "C" {
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_QUEUESYNC(hwnd, fn) \
     (void)(fn)((hwnd), WM_QUEUESYNC, 0L, 0L)
-#if (WINVER >= 0x030a)
 /* void Cls_OnCommNotify(HWND hwnd, int cid, UINT flags) */
 #define HANDLE_WM_COMMNOTIFY(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)(wParam), (UINT)LOWORD(lParam)), 0L)
 #define FORWARD_WM_COMMNOTIFY(hwnd, cid, flags, fn) \
     (void)(fn)((hwnd), WM_COMMNOTIFY, (WPARAM)(cid), MAKELPARAM((flags), 0))
-#endif
 
 /* void Cls_OnDisplayChange(HWND hwnd, UINT bitsPerPixel, UINT cxScreen, UINT cyScreen) */
 #define HANDLE_WM_DISPLAYCHANGE(hwnd, wParam, lParam, fn) \
@@ -1434,4 +1432,3 @@ extern "C" {
 #endif
 
 #endif
-