ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Store the comm error value in the wineserver, not a global.

Browse Source
This commit is contained in:
Mike McCormack 2001-08-20 18:01:35 +00:00 committed by Alexandre Julliard
parent 6f030e8d13
commit 07a8c5402a
1 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
dlls/kernel/comm.c
View File

@ -74,15 +74,6 @@ DEFAULT_DEBUG_CHANNEL(comm);
#define TIOCINQ FIONREAD #define TIOCINQ FIONREAD
#endif #endif
static int WinError(void)
{
TRACE("errno = %d\n", errno);
switch (errno) {
default:
return CE_IOE;
}
}
static int COMM_WhackModem(int fd, unsigned int andy, unsigned int orrie) static int COMM_WhackModem(int fd, unsigned int andy, unsigned int orrie)
{ {
unsigned int mstat, okay; unsigned int mstat, okay;
@ -379,8 +370,38 @@ BOOL WINAPI BuildCommDCBW(
return BuildCommDCBAndTimeoutsW(devid,lpdcb,NULL); return BuildCommDCBAndTimeoutsW(devid,lpdcb,NULL);
} }
/* FIXME: having these global for win32 for now */ static BOOL COMM_SetCommError(HANDLE handle, DWORD error)
int commerror=0; {
DWORD ret;
SERVER_START_REQ( set_serial_info )
{
req->handle = handle;
req->flags = SERIALINFO_SET_ERROR;
req->commerror = error;
ret = !SERVER_CALL_ERR();
}
SERVER_END_REQ;
return ret;
}
static BOOL COMM_GetCommError(HANDLE handle, LPDWORD lperror)
{
DWORD ret;
if(!lperror)
return FALSE;
SERVER_START_REQ( get_serial_info )
{
req->handle = handle;
ret = !SERVER_CALL_ERR();
*lperror = req->commerror;
}
SERVER_END_REQ;
return ret;
}
/***************************************************************************** /*****************************************************************************
* SetCommBreak (KERNEL32.@) * SetCommBreak (KERNEL32.@)
@ -489,7 +510,7 @@ BOOL WINAPI EscapeCommFunction(
} }
if (tcgetattr(fd,&port) == -1) { if (tcgetattr(fd,&port) == -1) {
commerror=WinError(); COMM_SetCommError(handle,CE_IOE);
close(fd); close(fd);
return FALSE; return FALSE;
} }
@ -562,8 +583,8 @@ BOOL WINAPI EscapeCommFunction(
if (!direct) if (!direct)
if (tcsetattr(fd, TCSADRAIN, &port) == -1) { if (tcsetattr(fd, TCSADRAIN, &port) == -1) {
commerror = WinError();
close(fd); close(fd);
COMM_SetCommError(handle,CE_IOE);
return FALSE; return FALSE;
} else } else
result= TRUE; result= TRUE;
@ -572,7 +593,7 @@ BOOL WINAPI EscapeCommFunction(
if (result == -1) if (result == -1)
{ {
result= FALSE; result= FALSE;
commerror=WinError(); COMM_SetCommError(handle,CE_IOE);
} }
else else
result = TRUE; result = TRUE;
@ -669,15 +690,8 @@ BOOL WINAPI ClearCommError(
close(fd); close(fd);
if(errors) COMM_GetCommError(handle, errors);
*errors = 0; COMM_SetCommError(handle, 0);
/*
** After an asynchronous write opperation, the
** app will call ClearCommError to see if the
** results are ready yet. It waits for ERROR_IO_PENDING
*/
commerror = ERROR_IO_PENDING;
return TRUE; return TRUE;
} }
@ -807,7 +821,7 @@ BOOL WINAPI SetCommState(
if ((tcgetattr(fd,&port)) == -1) { if ((tcgetattr(fd,&port)) == -1) {
int save_error = errno; int save_error = errno;
commerror = WinError(); COMM_SetCommError(handle,CE_IOE);
close( fd ); close( fd );
ERR("tcgetattr error '%s'\n", strerror(save_error)); ERR("tcgetattr error '%s'\n", strerror(save_error));
return FALSE; return FALSE;
@ -895,7 +909,7 @@ BOOL WINAPI SetCommState(
break; break;
#endif #endif
default: default:
commerror = IE_BAUDRATE; COMM_SetCommError(handle,IE_BAUDRATE);
close( fd ); close( fd );
ERR("baudrate %ld\n",lpdcb->BaudRate); ERR("baudrate %ld\n",lpdcb->BaudRate);
return FALSE; return FALSE;
@ -939,7 +953,7 @@ BOOL WINAPI SetCommState(
port.c_ospeed = B38400; port.c_ospeed = B38400;
break; break;
default: default:
commerror = IE_BAUDRATE; COMM_SetCommError(handle,IE_BAUDRATE);
close( fd ); close( fd );
ERR("baudrate %ld\n",lpdcb->BaudRate); ERR("baudrate %ld\n",lpdcb->BaudRate);
return FALSE; return FALSE;
@ -982,7 +996,7 @@ BOOL WINAPI SetCommState(
stopbits = TWOSTOPBITS; stopbits = TWOSTOPBITS;
port.c_iflag &= ~INPCK; port.c_iflag &= ~INPCK;
} else { } else {
commerror = IE_BYTESIZE; COMM_SetCommError(handle,IE_BYTESIZE);
close( fd ); close( fd );
ERR("Cannot set MARK Parity\n"); ERR("Cannot set MARK Parity\n");
return FALSE; return FALSE;
@ -993,7 +1007,7 @@ BOOL WINAPI SetCommState(
bytesize +=1; bytesize +=1;
port.c_iflag &= ~INPCK; port.c_iflag &= ~INPCK;
} else { } else {
commerror = IE_BYTESIZE; COMM_SetCommError(handle,IE_BYTESIZE);
close( fd ); close( fd );
ERR("Cannot set SPACE Parity\n"); ERR("Cannot set SPACE Parity\n");
return FALSE; return FALSE;
@ -1001,7 +1015,7 @@ BOOL WINAPI SetCommState(
break; break;
#endif #endif
default: default:
commerror = IE_BYTESIZE; COMM_SetCommError(handle,IE_BYTESIZE);
close( fd ); close( fd );
ERR("Parity\n"); ERR("Parity\n");
return FALSE; return FALSE;
@ -1023,7 +1037,7 @@ BOOL WINAPI SetCommState(
port.c_cflag |= CS8; port.c_cflag |= CS8;
break; break;
default: default:
commerror = IE_BYTESIZE; COMM_SetCommError(handle,IE_BYTESIZE);
close( fd ); close( fd );
ERR("ByteSize\n"); ERR("ByteSize\n");
return FALSE; return FALSE;
@ -1038,7 +1052,7 @@ BOOL WINAPI SetCommState(
port.c_cflag |= CSTOPB; port.c_cflag |= CSTOPB;
break; break;
default: default:
commerror = IE_BYTESIZE; COMM_SetCommError(handle,IE_BYTESIZE);
close( fd ); close( fd );
ERR("StopBits\n"); ERR("StopBits\n");
return FALSE; return FALSE;
@ -1070,12 +1084,12 @@ BOOL WINAPI SetCommState(
if (tcsetattr(fd,TCSANOW,&port)==-1) { /* otherwise it hangs with pending input*/ if (tcsetattr(fd,TCSANOW,&port)==-1) { /* otherwise it hangs with pending input*/
int save_error=errno; int save_error=errno;
commerror = WinError(); COMM_SetCommError(handle,CE_IOE);
close( fd ); close( fd );
ERR("tcsetattr error '%s'\n", strerror(save_error)); ERR("tcsetattr error '%s'\n", strerror(save_error));
return FALSE; return FALSE;
} else { } else {
commerror = 0; COMM_SetCommError(handle,0);
close( fd ); close( fd );
return TRUE; return TRUE;
} }
@ -1113,7 +1127,7 @@ BOOL WINAPI GetCommState(
if (tcgetattr(fd, &port) == -1) { if (tcgetattr(fd, &port) == -1) {
int save_error=errno; int save_error=errno;
ERR("tcgetattr error '%s'\n", strerror(save_error)); ERR("tcgetattr error '%s'\n", strerror(save_error));
commerror = WinError(); COMM_SetCommError(handle,CE_IOE);
close( fd ); close( fd );
return FALSE; return FALSE;
} }
@ -1262,7 +1276,7 @@ BOOL WINAPI GetCommState(
lpdcb->XonLim = 10; lpdcb->XonLim = 10;
lpdcb->XoffLim = 10; lpdcb->XoffLim = 10;
commerror = 0; COMM_SetCommError(handle,0);
TRACE("OK\n"); TRACE("OK\n");