diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-04-24 16:51:45 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-04-24 16:51:45 +0000 |
| commit | dacb3c05e1eaac21ef142c21288c5692fc08f7cb (patch) | |
| tree | 4537213f5e803fb8bc9fd10bd7e35b4b9a287db2 /plugins | |
| parent | 9a7b4084da6349adca6c1387f390da9bc813d09a (diff) | |
| download | pcsxr-dacb3c05e1eaac21ef142c21288c5692fc08f7cb.tar.gz | |
sio1blade windows crash fix;
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@90125 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/bladesio1/connection.c | 20 | ||||
| -rwxr-xr-x | plugins/bladesio1/connection.h | 6 |
2 files changed, 18 insertions, 8 deletions
diff --git a/plugins/bladesio1/connection.c b/plugins/bladesio1/connection.c index 5105b00c..17735032 100755 --- a/plugins/bladesio1/connection.c +++ b/plugins/bladesio1/connection.c @@ -47,7 +47,13 @@ static struct hostent *hostinfo; /***************************************************************************/ -s32 connectionOpen() { +int connectionOpen() { +#if defined _WINDOWS + WSADATA wsaData; + if(WSAStartup(0x202, &wsaData)) + fprintf(stderr, "[SIO1] ERROR: WSAStartup()\n"); +#endif + switch(settings.player) { case PLAYER_MASTER: { int reuse_addr = 1; @@ -120,12 +126,16 @@ void connectionClose() { //close(serversock); serversock = -1; } + +#if defined _WINDOWS + WSACleanup(); +#endif } /***************************************************************************/ -size_t connectionSend(u8 *pdata, s32 size) { - size_t bytes = 0; +int connectionSend(u8 *pdata, s32 size) { + int bytes = 0; if(clientsock >= 0) if((bytes = send(clientsock, (const char*)pdata, size, 0)) < 0) @@ -134,8 +144,8 @@ size_t connectionSend(u8 *pdata, s32 size) { return bytes; } -size_t connectionRecv(u8 *pdata, s32 size) { - size_t bytes = 0; +int connectionRecv(u8 *pdata, s32 size) { + int bytes = 0; if(clientsock >= 0) if((bytes = recv(clientsock, (char*)pdata, size, 0)) < 0) diff --git a/plugins/bladesio1/connection.h b/plugins/bladesio1/connection.h index aec71b5a..049c54d2 100755 --- a/plugins/bladesio1/connection.h +++ b/plugins/bladesio1/connection.h @@ -22,13 +22,13 @@ /***************************************************************************/ -extern s32 connectionOpen(); +extern int connectionOpen(); extern void connectionClose(); /***************************************************************************/ -extern size_t connectionSend(u8 *pdata, s32 size); -extern size_t connectionRecv(u8 *pdata, s32 size); +extern int connectionSend(u8 *pdata, s32 size); +extern int connectionRecv(u8 *pdata, s32 size); /***************************************************************************/ |