Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Johnny Cai
wine
Commits
c5ea29f9
Commit
c5ea29f9
authored
23 years ago
by
Michael McCormack
Committed by
Alexandre Julliard
23 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Return TRUE on success in COMM_BuildOldCommDCB.
DCB16.BaudRate > 57600 means 115200. OpenComm16 should use overlapped I/O.
parent
32fb5805
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/kernel/comm.c
+1
-5
1 addition, 5 deletions
dlls/kernel/comm.c
dlls/user/comm16.c
+29
-2
29 additions, 2 deletions
dlls/user/comm16.c
with
30 additions
and
7 deletions
dlls/kernel/comm.c
+
1
−
5
View file @
c5ea29f9
...
...
@@ -211,7 +211,7 @@ BOOL WINAPI COMM_BuildOldCommDCB(LPCSTR device, LPDCB lpdcb)
lpdcb
->
fRtsControl
=
RTS_CONTROL_ENABLE
;
}
return
0
;
return
TRUE
;
}
/**************************************************************************
...
...
@@ -844,10 +844,6 @@ BOOL WINAPI SetCommState(
port
.
c_lflag
&=
~
(
ICANON
|
ECHO
|
ISIG
);
port
.
c_lflag
|=
NOFLSH
;
/*
** MJM - removed default baudrate settings
** TRACE(comm,"baudrate %ld\n",lpdcb->BaudRate);
*/
#ifdef CBAUD
port
.
c_cflag
&=
~
CBAUD
;
switch
(
lpdcb
->
BaudRate
)
{
...
...
This diff is collapsed.
Click to expand it.
dlls/user/comm16.c
+
29
−
2
View file @
c5ea29f9
...
...
@@ -504,7 +504,8 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
return
IE_OPEN
;
handle
=
CreateFileA
(
device
,
GENERIC_READ
|
GENERIC_WRITE
,
FILE_SHARE_READ
|
FILE_SHARE_WRITE
,
NULL
,
CREATE_ALWAYS
,
0
,
0
);
FILE_SHARE_READ
|
FILE_SHARE_WRITE
,
NULL
,
CREATE_ALWAYS
,
FILE_FLAG_OVERLAPPED
|
FILE_FLAG_NO_BUFFERING
,
0
);
if
(
handle
==
INVALID_HANDLE_VALUE
)
{
ERR
(
"Couldn't open %s ! (%s)
\n
"
,
COM
[
port
].
devicename
,
strerror
(
errno
));
return
IE_HARDWARE
;
...
...
@@ -874,10 +875,36 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb)
memset
(
&
dcb
,
0
,
sizeof
dcb
);
dcb
.
DCBlength
=
sizeof
dcb
;
if
(
lpdcb
->
BaudRate
==
57601
)
/*
* according to MSDN, we should first interpret lpdcb->BaudRate as follows:
* 1. if the baud rate is a CBR constant, interpret it.
* 2. if it is greater than 57600, the baud rate is 115200
* 3. use the actual baudrate
* steps 2 and 3 are equivilent to 16550 baudrate divisor = 115200/BaudRate
* see http://support.microsoft.com/support/kb/articles/q108/9/28.asp
*/
switch
(
lpdcb
->
BaudRate
)
{
case
CBR_110
:
dcb
.
BaudRate
=
110
;
break
;
case
CBR_300
:
dcb
.
BaudRate
=
300
;
break
;
case
CBR_600
:
dcb
.
BaudRate
=
600
;
break
;
case
CBR_1200
:
dcb
.
BaudRate
=
1200
;
break
;
case
CBR_2400
:
dcb
.
BaudRate
=
2400
;
break
;
case
CBR_4800
:
dcb
.
BaudRate
=
4800
;
break
;
case
CBR_9600
:
dcb
.
BaudRate
=
9600
;
break
;
case
CBR_14400
:
dcb
.
BaudRate
=
14400
;
break
;
case
CBR_19200
:
dcb
.
BaudRate
=
19200
;
break
;
case
CBR_38400
:
dcb
.
BaudRate
=
38400
;
break
;
case
CBR_56000
:
dcb
.
BaudRate
=
56000
;
break
;
case
CBR_128000
:
dcb
.
BaudRate
=
128000
;
break
;
case
CBR_256000
:
dcb
.
BaudRate
=
256000
;
break
;
default:
if
(
lpdcb
->
BaudRate
>
57600
)
dcb
.
BaudRate
=
115200
;
else
dcb
.
BaudRate
=
lpdcb
->
BaudRate
;
}
dcb
.
ByteSize
=
lpdcb
->
ByteSize
;
dcb
.
StopBits
=
lpdcb
->
StopBits
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment