* include/rasdlg.h: New file.

* lib/rasdlg.def: New file.
	* lib/test.c: Include rasdlg.h.

winsup/w32api/ChangeLog

@@ -1,3 +1,9 @@
+2003-03-10  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/rasdlg.h: New file.
+	* lib/rasdlg.def: New file.
+	* lib/test.c: Include rasdlg.h.
+
 2003-03-06  Christopher January  <chris@atomice.net>
 
 	* include/winbase.h (FindFirstVolume): Add declaration.

winsup/w32api/include/rasdlg.h

@@ -0,0 +1,148 @@
+#ifndef _RASDLG_H_
+#define _RASDLG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <ras.h>
+
+#define RASPBDEVENT_AddEntry	1
+#define RASPBDEVENT_EditEntry	2
+#define RASPBDEVENT_RemoveEntry	3
+#define RASPBDEVENT_DialEntry	4
+#define RASPBDEVENT_EditGlobals	5
+#define RASPBDEVENT_NoUser	6
+#define RASPBDEVENT_NoUserEdit	7
+ 
+#define RASPBDFLAG_PositionDlg	1
+#define RASPBDFLAG_ForceCloseOnDial	2
+#define RASPBDFLAG_NoUser	16
+
+#define RASEDFLAG_PositionDlg	1
+#define RASEDFLAG_NewEntry	2
+#define RASEDFLAG_CloneEntry	4
+
+#define RASDDFLAG_PositionDlg	1
+
+#ifndef RC_INVOKED
+#include <pshpack4.h>
+
+typedef struct tagRASENTRYDLGA
+{
+	DWORD dwSize;
+	HWND  hwndOwner;
+	DWORD dwFlags;
+	LONG  xDlg;
+	LONG  yDlg;
+	CHAR  szEntry[RAS_MaxEntryName + 1];
+	DWORD dwError;
+	ULONG_PTR reserved;
+	ULONG_PTR reserved2;
+} RASENTRYDLGA, *LPRASENTRYDLGA;
+typedef struct tagRASENTRYDLGW
+{
+	DWORD dwSize;
+	HWND  hwndOwner;
+	DWORD dwFlags;
+	LONG  xDlg;
+	LONG  yDlg;
+	WCHAR szEntry[RAS_MaxEntryName + 1];
+	DWORD dwError;
+	ULONG_PTR reserved;
+	ULONG_PTR reserved2;
+} RASENTRYDLGW, *LPRASENTRYDLGW;
+
+typedef struct tagRASDIALDLG
+{
+	DWORD dwSize;
+	HWND  hwndOwner;
+	DWORD dwFlags;
+	LONG  xDlg;
+	LONG  yDlg;
+	DWORD dwSubEntry;
+	DWORD dwError;
+	ULONG_PTR reserved;
+	ULONG_PTR reserved2;
+} RASDIALDLG, *LPRASDIALDLG;
+
+/* Application-defined callback functions */
+typedef VOID (WINAPI* RASPBDLGFUNCW)(DWORD, DWORD, LPWSTR, LPVOID);
+typedef VOID (WINAPI* RASPBDLGFUNCA)(DWORD, DWORD, LPSTR, LPVOID);
+
+typedef struct tagRASPBDLGA
+{
+	DWORD         dwSize;
+	HWND          hwndOwner;
+	DWORD         dwFlags;
+	LONG          xDlg;
+	LONG          yDlg;
+	ULONG_PTR     dwCallbackId;
+	RASPBDLGFUNCA pCallback;
+	DWORD         dwError;
+	ULONG_PTR     reserved;
+	ULONG_PTR     reserved2;
+} RASPBDLGA, *LPRASPBDLGA;
+typedef struct tagRASPBDLGW
+{
+	DWORD         dwSize;
+	HWND          hwndOwner;
+	DWORD         dwFlags;
+	LONG          xDlg;
+	LONG          yDlg;
+	ULONG_PTR     dwCallbackId;
+	RASPBDLGFUNCW pCallback;
+	DWORD         dwError;
+	ULONG_PTR     reserved;
+	ULONG_PTR     reserved2;
+} RASPBDLGW, *LPRASPBDLGW;
+
+typedef struct tagRASNOUSERA
+{
+	DWORD dwSize;
+	DWORD dwFlags;
+	DWORD dwTimeoutMs;
+	CHAR  szUserName[UNLEN + 1];
+	CHAR  szPassword[PWLEN + 1];
+	CHAR  szDomain[DNLEN + 1];
+} RASNOUSERA, *LPRASNOUSERA;
+typedef struct tagRASNOUSERW
+{
+	DWORD dwSize;
+	DWORD dwFlags;
+	DWORD dwTimeoutMs;
+	WCHAR szUserName[UNLEN + 1];
+	WCHAR szPassword[PWLEN + 1];
+	WCHAR szDomain[DNLEN + 1];
+} RASNOUSERW, *LPRASNOUSERW ;
+
+#include <poppack.h>
+
+BOOL APIENTRY RasDialDlgA(LPSTR,LPSTR,LPSTR,LPRASDIALDLG);
+BOOL APIENTRY RasDialDlgW(LPWSTR,LPWSTR,LPWSTR,LPRASDIALDLG);
+BOOL APIENTRY RasEntryDlgA(LPSTR,LPSTR,LPRASENTRYDLGA);
+BOOL APIENTRY RasEntryDlgW(LPWSTR,LPWSTR,LPRASENTRYDLGW);
+BOOL APIENTRY RasPhonebookDlgA(LPSTR,LPSTR,LPRASPBDLGA);
+BOOL APIENTRY RasPhonebookDlgW(LPWSTR,LPWSTR,LPRASPBDLGW);
+
+#ifdef UNICODE
+typedef RASENTRYDLGW	RASENTRYDLG, *LPRASENTRYDLG;
+typedef RASPBDLGW	RASPBDLG, *LPRASPBDLG;
+typedef RASNOUSERW	RASNOUSER, *LPRASNOUSER;
+#define RasDialDlg	RasDialDlgW
+#define RasEntryDlg	RasEntryDlgW
+#define RasPhonebookDlg	RasPhonebookDlgW
+#else
+typedef RASENTRYDLGA	RASENTRYDLG, *LPRASENTRYDLG;
+typedef RASPBDLGA	RASPBDLG, *LPRASPBDLG;
+typedef RASNOUSERA	RASNOUSER, *LPRASNOUSER;
+#define RasDialDlg	RasDialDlgA
+#define RasEntryDlg	RasEntryDlgA
+#define RasPhonebookDlg	RasPhonebookDlgA
+#endif /* UNICODE */
+
+#endif /* RC_INVOKED */
+
+#ifdef __cplusplus
+}
+#endif
+#endif

winsup/w32api/lib/rasdlg.def

@@ -0,0 +1,8 @@
+LIBRARY "RASDLG.DLL"
+EXPORTS
+RasDialDlgA@16
+RasDialDlgW@16
+RasEntryDlgA@12
+RasEntryDlgW@12
+RasPhonebookDlgA@12
+RasPhonebookDlgW@12

winsup/w32api/lib/test.c

@@ -45,6 +45,7 @@
 #include <odbcinst.h>
 #include <psapi.h>
 #include <ras.h>
+#include <rasdlg.h>
 #include <raserror.h>
 #include <rassapi.h>
 #include <richedit.h>