Removed a few remaining WINVER checks.
diff --git a/include/imm.h b/include/imm.h
index 937a118..2269258 100644
--- a/include/imm.h
+++ b/include/imm.h
@@ -68,8 +68,6 @@
DECL_WINELIB_TYPE_AW(STYLEBUF)
DECL_WINELIB_TYPE_AW(LPSTYLEBUF)
-#if (WINVER >= 0x040A)
-
typedef struct tagRECONVERTSTRING
{
DWORD dwSize;
@@ -114,8 +112,6 @@
DECL_WINELIB_TYPE_AW(IMEMENUITEMINFO)
DECL_WINELIB_TYPE_AW(LPIMEMENUITEMINFO)
-#endif /* WINVER >= 0x040A */
-
typedef struct _tagCOMPOSITIONFORM
{
@@ -385,8 +381,6 @@
#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 @@
#define IMR_RECONVERTSTRING 0x0004
#define IMR_CONFIRMRECONVERTSTRING 0x0005
-#endif /* WINVER >= 0x040A */
-
/* error code of ImmGetCompositionString */
#define IMM_ERROR_NODATA (-1)
@@ -431,8 +423,6 @@
#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 @@
#define IMFS_UNHILITE MFS_UNHILITE
#define IMFS_DEFAULT MFS_DEFAULT
-#endif /* WINVER >= 0x040A */
-
-
/*
* type of soft keyboard
@@ -479,6 +466,7 @@
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 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 af0061d..dde22fe 100644
--- a/include/ras.h
+++ b/include/ras.h
@@ -37,6 +37,7 @@
#define RAS_MaxX25Address 200
#define RAS_MaxFacilities 200
#define RAS_MaxUserData 200
+#define RAS_MaxDnsSuffix 256
DECLARE_HANDLE(HRASCONN);
@@ -193,8 +194,6 @@
DWORD dwReserved1;
DWORD dwReserved2;
-#if (WINVER >= 0x401)
-
/* Multilink and BAP */
DWORD dwSubEntries;
@@ -207,17 +206,13 @@
/* 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 @@
CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1];
DWORD dwRedialCount;
DWORD dwRedialPause;
-#endif
} RASENTRYA, *LPRASENTRYA;
typedef struct tagRASENTRYW {
@@ -274,8 +268,6 @@
DWORD dwReserved1;
DWORD dwReserved2;
-#if (WINVER >= 0x401)
-
/* Multilink and BAP */
DWORD dwSubEntries;
@@ -288,17 +280,13 @@
/* 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 @@
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 545d081..dc7c01f 100644
--- a/include/windowsx.h
+++ b/include/windowsx.h
@@ -1308,13 +1308,11 @@
((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 @@
#endif
#endif
-
