rasdlg.h (5.2.3790.3959-Windows 5.0) | | rasdlg.h (6.0.6002.18005-Windows 6.0) |
| | |
skipping to change at line 137 | | skipping to change at line 137 |
#define RASPBDLG RASPBDLGA | | #define RASPBDLG RASPBDLGA |
#define RASPBDLGFUNC RASPBDLGFUNCA | | #define RASPBDLGFUNC RASPBDLGFUNCA |
#endif | | #endif |
| | |
#define LPRASPBDLGW RASPBDLGW* | | #define LPRASPBDLGW RASPBDLGW* |
#define LPRASPBDLGA RASPBDLGA* | | #define LPRASPBDLGA RASPBDLGA* |
#define LPRASPBDLG RASPBDLG* | | #define LPRASPBDLG RASPBDLG* |
| | |
/* RasEntryDlg API parameters. | | /* RasEntryDlg API parameters. |
*/ | | */ |
|
#define RASEDFLAG_PositionDlg 0x00000001 | | #define RASEDFLAG_PositionDlg 0x00000001 |
#define RASEDFLAG_NewEntry 0x00000002 | | #define RASEDFLAG_NewEntry 0x00000002 |
#define RASEDFLAG_CloneEntry 0x00000004 | | #if (WINVER < 0x600) |
#define RASEDFLAG_NoRename 0x00000008 | | #define RASEDFLAG_CloneEntry 0x00000004 |
#define RASEDFLAG_ShellOwned 0x40000000 | | #endif // (WINVER < 0x600) |
#define RASEDFLAG_NewPhoneEntry 0x00000010 | | #define RASEDFLAG_NoRename 0x00000008 |
#define RASEDFLAG_NewTunnelEntry 0x00000020 | | #define RASEDFLAG_ShellOwned 0x40000000 |
#define RASEDFLAG_NewDirectEntry 0x00000040 | | #define RASEDFLAG_NewPhoneEntry 0x00000010 |
#define RASEDFLAG_NewBroadbandEntry 0x00000080 | | #define RASEDFLAG_NewTunnelEntry 0x00000020 |
#define RASEDFLAG_InternetEntry 0x00000100 | | #if (WINVER < 0x600) |
#define RASEDFLAG_NAT 0x00000200 | | #define RASEDFLAG_NewDirectEntry 0x00000040 |
| | #endif // (WINVER < 0x600) |
| | #define RASEDFLAG_NewBroadbandEntry 0x00000080 |
| | #define RASEDFLAG_InternetEntry 0x00000100 |
| | #define RASEDFLAG_NAT 0x00000200 |
| | #if (WINVER >= 0x600) |
| | #define RASEDFLAG_IncomingConnection 0x00000400 |
| | #endif |
| | |
#define RASENTRYDLGW struct tagRASENTRYDLGW | | #define RASENTRYDLGW struct tagRASENTRYDLGW |
RASENTRYDLGW | | RASENTRYDLGW |
{ | | { |
IN DWORD dwSize; | | IN DWORD dwSize; |
IN HWND hwndOwner; | | IN HWND hwndOwner; |
IN DWORD dwFlags; | | IN DWORD dwFlags; |
IN LONG xDlg; | | IN LONG xDlg; |
IN LONG yDlg; | | IN LONG yDlg; |
OUT WCHAR szEntry[ RAS_MaxEntryName + 1 ]; | | OUT WCHAR szEntry[ RAS_MaxEntryName + 1 ]; |
| | |
skipping to change at line 209 | | skipping to change at line 216 |
IN LONG xDlg; | | IN LONG xDlg; |
IN LONG yDlg; | | IN LONG yDlg; |
IN DWORD dwSubEntry; | | IN DWORD dwSubEntry; |
OUT DWORD dwError; | | OUT DWORD dwError; |
IN ULONG_PTR reserved; | | IN ULONG_PTR reserved; |
IN ULONG_PTR reserved2; | | IN ULONG_PTR reserved2; |
}; | | }; |
| | |
#define LPRASDIALDLG RASDIALDLG* | | #define LPRASDIALDLG RASDIALDLG* |
| | |
|
/* RasMonitorDlg API parameters. | | |
*/ | | |
#if (WINVER <= 0x500) | | |
#define RASMDPAGE_Status 0 | | |
#define RASMDPAGE_Summary 1 | | |
#define RASMDPAGE_Preferences 2 | | |
| | |
#define RASMDFLAG_PositionDlg 0x00000001 | | |
#define RASMDFLAG_UpdateDefaults 0x80000000 | | |
| | |
#define RASMONITORDLG struct tagRASMONITORDLG | | |
RASMONITORDLG | | |
{ | | |
IN DWORD dwSize; | | |
IN HWND hwndOwner; | | |
IN DWORD dwFlags; | | |
IN DWORD dwStartPage; | | |
IN LONG xDlg; | | |
IN LONG yDlg; | | |
OUT DWORD dwError; | | |
IN ULONG_PTR reserved; | | |
IN ULONG_PTR reserved2; | | |
}; | | |
| | |
#define LPRASMONITORDLG RASMONITORDLG* | | |
#endif | | |
| | |
#if (WINVER >= 0x500) | | #if (WINVER >= 0x500) |
typedef BOOL (WINAPI *RasCustomDialDlgFn) ( | | typedef BOOL (WINAPI *RasCustomDialDlgFn) ( |
HINSTANCE hInstDll, | | HINSTANCE hInstDll, |
DWORD dwFlags, | | DWORD dwFlags, |
LPWSTR lpszPhonebook, | | LPWSTR lpszPhonebook, |
LPWSTR lpszEntry, | | LPWSTR lpszEntry, |
LPWSTR lpszPhoneNumber, | | LPWSTR lpszPhoneNumber, |
LPRASDIALDLG lpInfo, | | LPRASDIALDLG lpInfo, |
PVOID pvInfo | | PVOID pvInfo |
); | | ); |
| | |
skipping to change at line 260 | | skipping to change at line 240 |
LPWSTR lpszEntry, | | LPWSTR lpszEntry, |
LPRASENTRYDLG lpInfo, | | LPRASENTRYDLG lpInfo, |
DWORD dwFlags | | DWORD dwFlags |
); | | ); |
| | |
#endif | | #endif |
| | |
/* RAS common dialog API prototypes. | | /* RAS common dialog API prototypes. |
*/ | | */ |
BOOL APIENTRY RasPhonebookDlgA( | | BOOL APIENTRY RasPhonebookDlgA( |
|
LPSTR lpszPhonebook, LPSTR lpszEntry, LPRASPBDLGA lpInfo ); | | __in_opt LPSTR lpszPhonebook, __in_opt LPSTR lpszEntry, LPRASPBDLGA lpInfo )
; |
| | |
BOOL APIENTRY RasPhonebookDlgW( | | BOOL APIENTRY RasPhonebookDlgW( |
|
LPWSTR lpszPhonebook, LPWSTR lpszEntry, LPRASPBDLGW lpInfo ); | | __in_opt LPWSTR lpszPhonebook, __in_opt LPWSTR lpszEntry, LPRASPBDLGW lpInfo
); |
| | |
BOOL APIENTRY RasEntryDlgA( | | BOOL APIENTRY RasEntryDlgA( |
|
LPSTR lpszPhonebook, LPSTR lpszEntry, LPRASENTRYDLGA lpInfo ); | | __in_opt LPSTR lpszPhonebook, __in_opt LPSTR lpszEntry, LPRASENTRYDLGA lpInf
o ); |
| | |
BOOL APIENTRY RasEntryDlgW( | | BOOL APIENTRY RasEntryDlgW( |
|
LPWSTR lpszPhonebook, LPWSTR lpszEntry, LPRASENTRYDLGW lpInfo ); | | __in_opt LPWSTR lpszPhonebook, __in_opt LPWSTR lpszEntry, LPRASENTRYDLGW lpI
nfo ); |
| | |
BOOL APIENTRY RasDialDlgA( | | BOOL APIENTRY RasDialDlgA( |
|
LPSTR lpszPhonebook, LPSTR lpszEntry, LPSTR lpszPhoneNumber, | | __in_opt LPSTR lpszPhonebook, __in_opt LPSTR lpszEntry, __in_opt LPSTR lpszP |
LPRASDIALDLG lpInfo ); | | honeNumber, |
| | __inout LPRASDIALDLG lpInfo ); |
| | |
BOOL APIENTRY RasDialDlgW( | | BOOL APIENTRY RasDialDlgW( |
|
LPWSTR lpszPhonebook, LPWSTR lpszEntry, LPWSTR lpszPhoneNumber, | | __in_opt LPWSTR lpszPhonebook, __in_opt LPWSTR lpszEntry, __in_opt LPWSTR lp |
LPRASDIALDLG lpInfo ); | | szPhoneNumber, |
| | __inout LPRASDIALDLG lpInfo ); |
#if (WINVER <= 0x500) | | |
BOOL APIENTRY RasMonitorDlgA( | | |
LPSTR lpszDeviceName, LPRASMONITORDLG lpInfo ); | | |
| | |
BOOL APIENTRY RasMonitorDlgW( | | |
LPWSTR lpszDeviceName, LPRASMONITORDLG lpInfo ); | | |
#endif | | |
| | |
#ifdef UNICODE | | #ifdef UNICODE |
#define RasPhonebookDlg RasPhonebookDlgW | | #define RasPhonebookDlg RasPhonebookDlgW |
#define RasEntryDlg RasEntryDlgW | | #define RasEntryDlg RasEntryDlgW |
#define RasDialDlg RasDialDlgW | | #define RasDialDlg RasDialDlgW |
#if (WINVER <= 0x500) | | #if (WINVER <= 0x500) |
#define RasMonitorDlg RasMonitorDlgW | | #define RasMonitorDlg RasMonitorDlgW |
#endif | | #endif |
#else | | #else |
#define RasPhonebookDlg RasPhonebookDlgA | | #define RasPhonebookDlg RasPhonebookDlgA |
| | |
End of changes. 8 change blocks. |
54 lines changed or deleted | | 28 lines changed or added |
|