--- np2/win9x/sstp.cpp	2003/10/16 17:58:49	1.1.1.1
+++ np2/win9x/sstp.cpp	2005/02/09 20:11:35	1.3
@@ -6,7 +6,6 @@
 
 
 static	HWND		sstphwnd = NULL;
-static	BOOL		sstpinused = FALSE;
 static	int			sstp_stat = SSTP_READY;
 static	SOCKET		hSocket = INVALID_SOCKET;
 static	WSAData		wsadata;
@@ -28,7 +27,8 @@ static HANDLE check_sakura(void) {
 
 	HANDLE	hsakura;
 
-	if ((hsakura = OpenMutex(MUTEX_ALL_ACCESS, FALSE, "sakura")) != NULL) {
+	hsakura = OpenMutex(MUTEX_ALL_ACCESS, FALSE, OEMTEXT("sakura"));
+	if (hsakura != NULL) {
 		CloseHandle(hsakura);
 	}
 	return(hsakura);
@@ -37,7 +37,7 @@ static HANDLE check_sakura(void) {
 
 // ------------------------------------------------------------------ Async...
 
-BOOL sstp_send(char *msg, void *proc) {
+BOOL sstp_send(char *msg, void (*proc)(HWND hWnd, char *msg)) {
 
 	sockaddr_in	s_in;
 
@@ -55,7 +55,7 @@ BOOL sstp_send(char *msg, void *proc) {
 		return(FAILURE);
 	}
 
-	wsprintf(sstpstr, sendermes, msg);
+	SPRINTF(sstpstr, sendermes, msg);
 	sstprcv[0] = 0;
 	sstppos = 0;
 
@@ -78,7 +78,7 @@ BOOL sstp_send(char *msg, void *proc) {
 		}
 	}
 	sstp_stat = SSTP_SENDING;
-	sstpproc = (void (*)(HWND, char *))proc;
+	sstpproc = proc;
 	return(SUCCESS);
 
 sstp_senderror:;
@@ -107,7 +107,7 @@ void sstp_readSocket(void) {
 		int		len;
 		char	buf[256];
 		while(1) {
-			if (ioctlsocket(hSocket, FIONREAD, &available) != NULL) {
+			if (ioctlsocket(hSocket, FIONREAD, &available) != 0) {
 				break;
 			}
 			if (!available) {
@@ -192,7 +192,7 @@ BOOL sstp_sendonly(char *msg) {
 			s_in.sin_port = htons(np2oscfg.sstpport);
 			if (connect(lSocket, (sockaddr *)&s_in, sizeof(s_in))
 															!= SOCKET_ERROR) {
-				wsprintf(msgstr, sendermes, msg);
+				SPRINTF(msgstr, sendermes, msg);
 				send(lSocket, msgstr, strlen(msgstr), 0);
 				ret = SUCCESS;
 			}