ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed a few remaining WINVER checks.

This commit is contained in:
Alexandre Julliard 2003-08-21 21:32:48 +00:00
parent 871cd03567
commit 6677ac4bc0
3 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/imm.h
View File

@ -68,8 +68,6 @@ typedef struct tagSTYLEBUFW
DECL_WINELIB_TYPE_AW(STYLEBUF) DECL_WINELIB_TYPE_AW(STYLEBUF)
DECL_WINELIB_TYPE_AW(LPSTYLEBUF) DECL_WINELIB_TYPE_AW(LPSTYLEBUF)
#if (WINVER >= 0x040A)
typedef struct tagRECONVERTSTRING typedef struct tagRECONVERTSTRING
{ {
DWORD dwSize; DWORD dwSize;
@ -114,8 +112,6 @@ typedef struct tagIMEMENUITEMINFOW
DECL_WINELIB_TYPE_AW(IMEMENUITEMINFO) DECL_WINELIB_TYPE_AW(IMEMENUITEMINFO)
DECL_WINELIB_TYPE_AW(LPIMEMENUITEMINFO) DECL_WINELIB_TYPE_AW(LPIMEMENUITEMINFO)
#endif /* WINVER >= 0x040A */
typedef struct _tagCOMPOSITIONFORM typedef struct _tagCOMPOSITIONFORM
{ {
@ -385,8 +381,6 @@ typedef struct _tagCOMPOSITIONFORM
#define IMN_PRIVATE 0x000E #define IMN_PRIVATE 0x000E
#if (WINVER >= 0x040A)
/* wParam of report message WM_IME_REQUEST */ /* wParam of report message WM_IME_REQUEST */
#define IMR_COMPOSITIONWINDOW 0x0001 #define IMR_COMPOSITIONWINDOW 0x0001
#define IMR_CANDIDATEWINDOW 0x0002 #define IMR_CANDIDATEWINDOW 0x0002
@ -394,8 +388,6 @@ typedef struct _tagCOMPOSITIONFORM
#define IMR_RECONVERTSTRING 0x0004 #define IMR_RECONVERTSTRING 0x0004
#define IMR_CONFIRMRECONVERTSTRING 0x0005 #define IMR_CONFIRMRECONVERTSTRING 0x0005
#endif /* WINVER >= 0x040A */
/* error code of ImmGetCompositionString */ /* error code of ImmGetCompositionString */
#define IMM_ERROR_NODATA (-1) #define IMM_ERROR_NODATA (-1)
@ -431,8 +423,6 @@ typedef struct _tagCOMPOSITIONFORM
#define IME_REGWORD_STYLE_USER_LAST 0xFFFFFFFF #define IME_REGWORD_STYLE_USER_LAST 0xFFFFFFFF
#if (WINVER >= 0x040A)
/* dwFlags for ImmAssociateContextEx */ /* dwFlags for ImmAssociateContextEx */
#define IACE_CHILDREN 0x0001 #define IACE_CHILDREN 0x0001
#define IACE_DEFAULT 0x0010 #define IACE_DEFAULT 0x0010
@ -465,9 +455,6 @@ typedef struct _tagCOMPOSITIONFORM
#define IMFS_UNHILITE MFS_UNHILITE #define IMFS_UNHILITE MFS_UNHILITE
#define IMFS_DEFAULT MFS_DEFAULT #define IMFS_DEFAULT MFS_DEFAULT
#endif /* WINVER >= 0x040A */
/* /*
* type of soft keyboard * type of soft keyboard
@ -479,6 +466,7 @@ typedef struct _tagCOMPOSITIONFORM
HIMC WINAPI ImmAssociateContext(HWND, HIMC); HIMC WINAPI ImmAssociateContext(HWND, HIMC);
BOOL WINAPI ImmAssociateContextEx(HWND, HIMC, DWORD);
BOOL WINAPI ImmConfigureIMEA(HKL, HWND, DWORD, LPVOID); BOOL WINAPI ImmConfigureIMEA(HKL, HWND, DWORD, LPVOID);
BOOL WINAPI ImmConfigureIMEW(HKL, HWND, DWORD, LPVOID); BOOL WINAPI ImmConfigureIMEW(HKL, HWND, DWORD, LPVOID);
#define ImmConfigureIME WINELIB_NAME_AW(ImmConfigureIME) #define ImmConfigureIME WINELIB_NAME_AW(ImmConfigureIME)
@ -555,12 +543,6 @@ BOOL WINAPI ImmUnregisterWordA(HKL, LPCSTR, DWORD, LPCSTR);
BOOL WINAPI ImmUnregisterWordW(HKL, LPCWSTR, DWORD, LPCWSTR); BOOL WINAPI ImmUnregisterWordW(HKL, LPCWSTR, DWORD, LPCWSTR);
#define ImmUnregisterWord WINELIB_NAME_AW(ImmUnregisterWord) #define ImmUnregisterWord WINELIB_NAME_AW(ImmUnregisterWord)
#if (WINVER >= 0x040A)
BOOL WINAPI ImmAssociateContextEx(HWND, HIMC, DWORD);
#endif /* WINVER >= 0x040A */
#ifdef __cplusplus #ifdef __cplusplus
} }

19
include/ras.h
View File

@ -37,6 +37,7 @@ extern "C" {
#define RAS_MaxX25Address 200 #define RAS_MaxX25Address 200
#define RAS_MaxFacilities 200 #define RAS_MaxFacilities 200
#define RAS_MaxUserData 200 #define RAS_MaxUserData 200
#define RAS_MaxDnsSuffix 256
DECLARE_HANDLE(HRASCONN); DECLARE_HANDLE(HRASCONN);
@ -193,8 +194,6 @@ typedef struct tagRASENTRYA {
DWORD dwReserved1; DWORD dwReserved1;
DWORD dwReserved2; DWORD dwReserved2;
#if (WINVER >= 0x401)
/* Multilink and BAP */ /* Multilink and BAP */
DWORD dwSubEntries; DWORD dwSubEntries;
@ -207,17 +206,13 @@ typedef struct tagRASENTRYA {
/* Idle time out */ /* Idle time out */
DWORD dwIdleDisconnectSeconds; DWORD dwIdleDisconnectSeconds;
#endif
#if (WINVER >= 0x500)
DWORD dwType; /* entry type */ DWORD dwType; /* entry type */
DWORD dwEncryptionType; /* type of encryption to use */ DWORD dwEncryptionType; /* type of encryption to use */
DWORD dwCustomAuthKey; /* authentication key for EAP */ DWORD dwCustomAuthKey; /* authentication key for EAP */
GUID guidId; /* guid that represents the phone-book entry */ GUID guidId; /* guid that represents the phone-book entry */
CHAR szCustomDialDll[MAX_PATH]; /* DLL for custom dialing */ CHAR szCustomDialDll[MAX_PATH]; /* DLL for custom dialing */
DWORD dwVpnStrategy; /* specifies type of VPN protocol */ DWORD dwVpnStrategy; /* specifies type of VPN protocol */
#endif
#if (WINVER >= 0x501)
DWORD dwfOptions2; DWORD dwfOptions2;
DWORD dwfOptions3; DWORD dwfOptions3;
CHAR szDnsSuffix[RAS_MaxDnsSuffix]; CHAR szDnsSuffix[RAS_MaxDnsSuffix];
@ -226,7 +221,6 @@ typedef struct tagRASENTRYA {
CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; CHAR szPrerequisiteEntry[RAS_MaxEntryName + 1];
DWORD dwRedialCount; DWORD dwRedialCount;
DWORD dwRedialPause; DWORD dwRedialPause;
#endif
} RASENTRYA, *LPRASENTRYA; } RASENTRYA, *LPRASENTRYA;
typedef struct tagRASENTRYW { typedef struct tagRASENTRYW {
@ -274,8 +268,6 @@ typedef struct tagRASENTRYW {
DWORD dwReserved1; DWORD dwReserved1;
DWORD dwReserved2; DWORD dwReserved2;
#if (WINVER >= 0x401)
/* Multilink and BAP */ /* Multilink and BAP */
DWORD dwSubEntries; DWORD dwSubEntries;
@ -288,17 +280,13 @@ typedef struct tagRASENTRYW {
/* Idle time out */ /* Idle time out */
DWORD dwIdleDisconnectSeconds; DWORD dwIdleDisconnectSeconds;
#endif
#if (WINVER >= 0x500)
DWORD dwType; /* entry type */ DWORD dwType; /* entry type */
DWORD dwEncryptionType; /* type of encryption to use */ DWORD dwEncryptionType; /* type of encryption to use */
DWORD dwCustomAuthKey; /* authentication key for EAP */ DWORD dwCustomAuthKey; /* authentication key for EAP */
GUID guidId; /* guid that represents the phone-book entry */ GUID guidId; /* guid that represents the phone-book entry */
WCHAR szCustomDialDll[MAX_PATH]; /* DLL for custom dialing */ WCHAR szCustomDialDll[MAX_PATH]; /* DLL for custom dialing */
DWORD dwVpnStrategy; /* specifies type of VPN protocol */ DWORD dwVpnStrategy; /* specifies type of VPN protocol */
#endif
#if (WINVER >= 0x501)
DWORD dwfOptions2; DWORD dwfOptions2;
DWORD dwfOptions3; DWORD dwfOptions3;
WCHAR szDnsSuffix[RAS_MaxDnsSuffix]; WCHAR szDnsSuffix[RAS_MaxDnsSuffix];
@ -307,7 +295,6 @@ typedef struct tagRASENTRYW {
WCHAR szPrerequisiteEntry[RAS_MaxEntryName + 1]; WCHAR szPrerequisiteEntry[RAS_MaxEntryName + 1];
DWORD dwRedialCount; DWORD dwRedialCount;
DWORD dwRedialPause; DWORD dwRedialPause;
#endif
} RASENTRYW, *LPRASENTRYW; } RASENTRYW, *LPRASENTRYW;
DECL_WINELIB_TYPE_AW(RASENTRY) DECL_WINELIB_TYPE_AW(RASENTRY)

3
include/windowsx.h
View File

@ -1308,13 +1308,11 @@ extern "C" {
((fn)(hwnd), 0L) ((fn)(hwnd), 0L)
#define FORWARD_WM_QUEUESYNC(hwnd, fn) \ #define FORWARD_WM_QUEUESYNC(hwnd, fn) \
(void)(fn)((hwnd), WM_QUEUESYNC, 0L, 0L) (void)(fn)((hwnd), WM_QUEUESYNC, 0L, 0L)
#if (WINVER >= 0x030a)
/* void Cls_OnCommNotify(HWND hwnd, int cid, UINT flags) */ /* void Cls_OnCommNotify(HWND hwnd, int cid, UINT flags) */
#define HANDLE_WM_COMMNOTIFY(hwnd, wParam, lParam, fn) \ #define HANDLE_WM_COMMNOTIFY(hwnd, wParam, lParam, fn) \
((fn)((hwnd), (int)(wParam), (UINT)LOWORD(lParam)), 0L) ((fn)((hwnd), (int)(wParam), (UINT)LOWORD(lParam)), 0L)
#define FORWARD_WM_COMMNOTIFY(hwnd, cid, flags, fn) \ #define FORWARD_WM_COMMNOTIFY(hwnd, cid, flags, fn) \
(void)(fn)((hwnd), WM_COMMNOTIFY, (WPARAM)(cid), MAKELPARAM((flags), 0)) (void)(fn)((hwnd), WM_COMMNOTIFY, (WPARAM)(cid), MAKELPARAM((flags), 0))
#endif
/* void Cls_OnDisplayChange(HWND hwnd, UINT bitsPerPixel, UINT cxScreen, UINT cyScreen) */ /* void Cls_OnDisplayChange(HWND hwnd, UINT bitsPerPixel, UINT cxScreen, UINT cyScreen) */
#define HANDLE_WM_DISPLAYCHANGE(hwnd, wParam, lParam, fn) \ #define HANDLE_WM_DISPLAYCHANGE(hwnd, wParam, lParam, fn) \
@ -1434,4 +1432,3 @@ extern "C" {
#endif #endif
#endif #endif