* include/mprapi.h (MprConfigBufferFree,MprConfigGetFriendlyName)

	(MprConfigGetGuidName,MprConfigInterfaceCreate)
	(MprConfigInterfaceDelete,MprConfigInterfaceEnum)
	(MprConfigInterfaceGetHandle,MprConfigInterfaceGetInfo)
	(MprConfigInterfaceSetInfo,MprConfigInterfaceTransportAdd)
	(MprConfigInterfaceTransportEnum,MprConfigInterfaceTransportGetHandle)
	(MprConfigInterfaceTransportGetInfo,MprConfigInterfaceTransportRemove)
	(MprConfigInterfaceTransportSetInfo,MprConfigServerBackup)
	(MprConfigServerConnect,MprConfigServerDisconnect)
	(MprConfigServerGetInfo,MprConfigServerInstall)
	(MprConfigServerRestore,MprConfigTransportCreate)
	(MprConfigTransportDelete,MprConfigTransportEnum)
	(MprConfigTransportGetHandle,MprConfigTransportGetInfo)
	(MprConfigTransportSetInfo): Declare functions.

2 files changed, 67 insertions, 22 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 2ae5bec0b..f7876aa6d 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,6 +1,23 @@
 2006-05-12  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
-	* include/mprapi.h:(MprAdminBufferFree)
+	* include/mprapi.h (MprConfigBufferFree,MprConfigGetFriendlyName)
+	(MprConfigGetGuidName,MprConfigInterfaceCreate)
+	(MprConfigInterfaceDelete,MprConfigInterfaceEnum)
+	(MprConfigInterfaceGetHandle,MprConfigInterfaceGetInfo)
+	(MprConfigInterfaceSetInfo,MprConfigInterfaceTransportAdd)
+	(MprConfigInterfaceTransportEnum,MprConfigInterfaceTransportGetHandle)
+	(MprConfigInterfaceTransportGetInfo,MprConfigInterfaceTransportRemove)
+	(MprConfigInterfaceTransportSetInfo,MprConfigServerBackup)
+	(MprConfigServerConnect,MprConfigServerDisconnect)
+	(MprConfigServerGetInfo,MprConfigServerInstall)
+	(MprConfigServerRestore,MprConfigTransportCreate)
+	(MprConfigTransportDelete,MprConfigTransportEnum)
+	(MprConfigTransportGetHandle,MprConfigTransportGetInfo)
+	(MprConfigTransportSetInfo): Declare functions.
+
+2006-05-12  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/mprapi.h (MprAdminBufferFree)
 	(MprAdminDeregisterConnectionNotification,MprAdminGetErrorString)
 	(MprAdminInterfaceConnect,MprAdminInterfaceCreate)
 	(MprAdminInterfaceDelete,MprAdminInterfaceDeviceGetInfo)
diff --git a/winsup/w32api/include/mprapi.h b/winsup/w32api/include/mprapi.h
index 3ef3e7f3e..0d9b69b76 100644
--- a/winsup/w32api/include/mprapi.h
+++ b/winsup/w32api/include/mprapi.h
@@ -491,27 +491,55 @@ DWORD WINAPI MprAdminInterfaceGetHandle(MPR_SERVER_HANDLE,LPWSTR,HANDLE*,BOOL);
 DWORD WINAPI MprAdminInterfaceGetInfo(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE*);
 DWORD WINAPI MprAdminInterfaceQueryUpdateResult(MPR_SERVER_HANDLE,HANDLE,DWORD,LPDWORD);
 DWORD WINAPI MprAdminInterfaceSetCredentials(LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR);
-DWORD MprAdminInterfaceSetCredentialsEx(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE);
-DWORD MprAdminInterfaceSetInfo(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE);
-DWORD MprAdminInterfaceTransportAdd(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE,DWORD);
-DWORD MprAdminInterfaceTransportGetInfo(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE*,LPDWORD);
-DWORD MprAdminInterfaceTransportRemove(MPR_SERVER_HANDLE,HANDLE,DWORD);
-DWORD MprAdminInterfaceTransportSetInfo(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE,DWORD);
-DWORD MprAdminInterfaceUpdatePhonebookInfo(MPR_SERVER_HANDLE,HANDLE);
-DWORD MprAdminInterfaceUpdateRoutes(MPR_SERVER_HANDLE,HANDLE,DWORD,HANDLE);
-DWORD MprAdminIsDomainRasServer(PWCHAR,PWCHAR,PBOOL);
-BOOL MprAdminIsServiceRunning(LPWSTR);
-DWORD MprAdminRegisterConnectionNotification(MPR_SERVER_HANDLE,HANDLE);
-DWORD MprAdminServerConnect(LPWSTR,MPR_SERVER_HANDLE*);
-void MprAdminServerDisconnect(MPR_SERVER_HANDLE);
-DWORD MprAdminServerGetCredentials(MPR_SERVER_HANDLE,DWORD,LPBYTE*);
-DWORD MprAdminInterfaceGetCredentialsEx(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE*);
-DWORD MprAdminServerGetInfo(MPR_SERVER_HANDLE,DWORD,LPBYTE*);
-DWORD MprAdminServerSetCredentials(MPR_SERVER_HANDLE,DWORD,LPBYTE);
-DWORD MprAdminServerSetInfo(MPR_SERVER_HANDLE,DWORD,LPBYTE);
-DWORD MprAdminTransportCreate(MPR_SERVER_HANDLE,DWORD,LPWSTR,LPBYTE,DWORD,LPBYTE,DWORD,LPWSTR);
-DWORD MprAdminTransportGetInfo(MPR_SERVER_HANDLE,DWORD,LPBYTE*,LPDWORD,LPBYTE*,LPDWORD);
-DWORD MprAdminTransportSetInfo(MPR_SERVER_HANDLE,DWORD,LPBYTE,DWORD,LPBYTE,DWORD);
+DWORD WINAPI MprAdminInterfaceSetCredentialsEx(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE);
+DWORD WINAPI MprAdminInterfaceSetInfo(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE);
+DWORD WINAPI MprAdminInterfaceTransportAdd(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE,DWORD);
+DWORD WINAPI MprAdminInterfaceTransportGetInfo(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE*,LPDWORD);
+DWORD WINAPI MprAdminInterfaceTransportRemove(MPR_SERVER_HANDLE,HANDLE,DWORD);
+DWORD WINAPI MprAdminInterfaceTransportSetInfo(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE,DWORD);
+DWORD WINAPI MprAdminInterfaceUpdatePhonebookInfo(MPR_SERVER_HANDLE,HANDLE);
+DWORD WINAPI MprAdminInterfaceUpdateRoutes(MPR_SERVER_HANDLE,HANDLE,DWORD,HANDLE);
+DWORD WINAPI MprAdminIsDomainRasServer(PWCHAR,PWCHAR,PBOOL);
+BOOL WINAPI MprAdminIsServiceRunning(LPWSTR);
+DWORD WINAPI MprAdminRegisterConnectionNotification(MPR_SERVER_HANDLE,HANDLE);
+DWORD WINAPI MprAdminServerConnect(LPWSTR,MPR_SERVER_HANDLE*);
+void WINAPI MprAdminServerDisconnect(MPR_SERVER_HANDLE);
+DWORD WINAPI MprAdminServerGetCredentials(MPR_SERVER_HANDLE,DWORD,LPBYTE*);
+DWORD WINAPI MprAdminInterfaceGetCredentialsEx(MPR_SERVER_HANDLE,HANDLE,DWORD,LPBYTE*);
+DWORD WINAPI MprAdminServerGetInfo(MPR_SERVER_HANDLE,DWORD,LPBYTE*);
+DWORD WINAPI MprAdminServerSetCredentials(MPR_SERVER_HANDLE,DWORD,LPBYTE);
+DWORD WINAPI MprAdminServerSetInfo(MPR_SERVER_HANDLE,DWORD,LPBYTE);
+DWORD WINAPI MprAdminTransportCreate(MPR_SERVER_HANDLE,DWORD,LPWSTR,LPBYTE,DWORD,LPBYTE,DWORD,LPWSTR);
+DWORD WINAPI MprAdminTransportGetInfo(MPR_SERVER_HANDLE,DWORD,LPBYTE*,LPDWORD,LPBYTE*,LPDWORD);
+DWORD WINAPI MprAdminTransportSetInfo(MPR_SERVER_HANDLE,DWORD,LPBYTE,DWORD,LPBYTE,DWORD);
+/*--- Router Management Reference - Router Configuration Functions */
+DWORD WINAPI MprConfigBufferFree(LPVOID);
+DWORD WINAPI MprConfigGetFriendlyName(HANDLE,PWCHAR,PWCHAR,DWORD);
+DWORD WINAPI MprConfigGetGuidName(HANDLE,PWCHAR,PWCHAR,DWORD);
+DWORD WINAPI MprConfigInterfaceCreate(HANDLE,DWORD,LPBYTE,HANDLE*);
+DWORD WINAPI MprConfigInterfaceDelete(HANDLE,HANDLE);
+DWORD WINAPI MprConfigInterfaceEnum(HANDLE,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
+DWORD WINAPI MprConfigInterfaceGetHandle(HANDLE,LPWSTR,HANDLE*);
+DWORD WINAPI MprConfigInterfaceGetInfo(HANDLE,HANDLE,DWORD,LPBYTE*,LPDWORD);
+DWORD WINAPI MprConfigInterfaceSetInfo(HANDLE,HANDLE,DWORD,LPBYTE);
+DWORD WINAPI MprConfigInterfaceTransportAdd(HANDLE,HANDLE,DWORD,LPWSTR,LPBYTE,DWORD,HANDLE*);
+DWORD WINAPI MprConfigInterfaceTransportEnum(HANDLE,HANDLE,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
+DWORD WINAPI MprConfigInterfaceTransportGetHandle(HANDLE,HANDLE,DWORD,HANDLE*);
+DWORD WINAPI MprConfigInterfaceTransportGetInfo(HANDLE,HANDLE,HANDLE,LPBYTE*,LPDWORD);
+DWORD WINAPI MprConfigInterfaceTransportRemove(HANDLE,HANDLE,HANDLE);
+DWORD WINAPI MprConfigInterfaceTransportSetInfo(HANDLE,HANDLE,HANDLE,LPBYTE,DWORD);
+DWORD WINAPI MprConfigServerBackup(HANDLE,LPWSTR);
+DWORD WINAPI MprConfigServerConnect(LPWSTR,HANDLE*);
+void WINAPI MprConfigServerDisconnect(HANDLE);
+DWORD WINAPI MprConfigServerGetInfo(HANDLE,DWORD,LPBYTE*);
+DWORD WINAPI MprConfigServerInstall(DWORD,PVOID);
+DWORD WINAPI MprConfigServerRestore(HANDLE,LPWSTR);
+DWORD WINAPI MprConfigTransportCreate(HANDLE,DWORD,LPWSTR,LPBYTE,DWORD,LPBYTE,DWORD,LPWSTR,HANDLE);
+DWORD WINAPI MprConfigTransportDelete(HANDLE,HANDLE);
+DWORD WINAPI MprConfigTransportEnum(HANDLE,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
+DWORD WINAPI MprConfigTransportGetHandle(HANDLE,DWORD,HANDLE*);
+DWORD WINAPI MprConfigTransportGetInfo(HANDLE,HANDLE,LPBYTE*,LPDWORD,LPBYTE*,LPDWORD,LPWSTR*);
+DWORD WINAPI MprConfigTransportSetInfo(HANDLE,HANDLE,LPBYTE,DWORD,LPBYTE,DWORD,LPWSTR);
 #endif /* (_WIN32_WINNT >= 0x0500) */
 
 #ifdef __cplusplus