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
Sam Joan Roque-Worcel
wine
Commits
5355a787
Commit
5355a787
authored
23 years ago
by
Michael McCormack
Committed by
Alexandre Julliard
23 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Only RTS_CONTROL_HANDSHAKE should set CRTSCTS.
parent
2681c021
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
+9
-10
9 additions, 10 deletions
dlls/kernel/comm.c
dlls/user/comm16.c
+4
-5
4 additions, 5 deletions
dlls/user/comm16.c
with
13 additions
and
15 deletions
dlls/kernel/comm.c
+
9
−
10
View file @
5355a787
...
...
@@ -203,8 +203,8 @@ BOOL WINAPI COMM_BuildOldCommDCB(LPCSTR device, LPDCB lpdcb)
lpdcb
->
fInX
=
FALSE
;
lpdcb
->
fOutX
=
FALSE
;
lpdcb
->
fOutxCtsFlow
=
TRUE
;
lpdcb
->
fOutxDsrFlow
=
TRU
E
;
lpdcb
->
fDtrControl
=
DTR_CONTROL_
HANDSHAK
E
;
lpdcb
->
fOutxDsrFlow
=
FALS
E
;
lpdcb
->
fDtrControl
=
DTR_CONTROL_
ENABL
E
;
lpdcb
->
fRtsControl
=
RTS_CONTROL_HANDSHAKE
;
}
else
{
lpdcb
->
fInX
=
FALSE
;
...
...
@@ -1061,7 +1061,7 @@ BOOL WINAPI SetCommState(
}
#ifdef CRTSCTS
if
(
lpdcb
->
fOutxCtsFlow
||
lpdcb
->
fRtsControl
==
RTS_CONTROL_
ENABL
E
lpdcb
->
fRtsControl
==
RTS_CONTROL_
HANDSHAK
E
)
{
port
.
c_cflag
|=
CRTSCTS
;
...
...
@@ -1069,7 +1069,7 @@ BOOL WINAPI SetCommState(
}
#endif
if
(
lpdcb
->
fDtrControl
==
DTR_CONTROL_
ENABL
E
)
if
(
lpdcb
->
fDtrControl
==
DTR_CONTROL_
HANDSHAK
E
)
{
WARN
(
"DSR/DTR flow control not supported
\n
"
);
}
...
...
@@ -1250,17 +1250,17 @@ BOOL WINAPI GetCommState(
/* termios does not support DTR/DSR flow control */
lpdcb
->
fOutxDsrFlow
=
0
;
lpdcb
->
fDtrControl
=
DTR_CONTROL_
DIS
ABLE
;
lpdcb
->
fDtrControl
=
DTR_CONTROL_
EN
ABLE
;
#ifdef CRTSCTS
if
(
port
.
c_cflag
&
CRTSCTS
)
{
lpdcb
->
fRtsControl
=
RTS_CONTROL_
ENABL
E
;
lpdcb
->
fRtsControl
=
RTS_CONTROL_
HANDSHAK
E
;
lpdcb
->
fOutxCtsFlow
=
1
;
}
else
#endif
{
lpdcb
->
fRtsControl
=
RTS_CONTROL_
DIS
ABLE
;
lpdcb
->
fRtsControl
=
RTS_CONTROL_
EN
ABLE
;
lpdcb
->
fOutxCtsFlow
=
0
;
}
if
(
port
.
c_iflag
&
IXON
)
...
...
@@ -1291,12 +1291,11 @@ BOOL WINAPI GetCommState(
(
lpdcb
->
fOutX
)
?
"IXOFF"
:
"~IXOFF"
);
#ifdef CRTSCTS
if
(
lpdcb
->
fOutxCtsFlow
||
lpdcb
->
fDtrControl
==
DTR_CONTROL_ENABLE
||
lpdcb
->
fRtsControl
==
RTS_CONTROL_ENABLE
lpdcb
->
fRtsControl
==
RTS_CONTROL_HANDSHAKE
)
TRACE
(
"CRTSCTS
\n
"
);
else
if
(
lpdcb
->
fDtrControl
==
DTR_CONTROL_DISABLE
)
TRACE
(
"~CRTSCTS
\n
"
);
#endif
...
...
This diff is collapsed.
Click to expand it.
dlls/user/comm16.c
+
4
−
5
View file @
5355a787
...
...
@@ -422,10 +422,9 @@ INT16 COMM16_DCBtoDCB16(LPDCB lpdcb, LPDCB16 lpdcb16)
lpdcb16
->
fNull
=
0
;
lpdcb16
->
fChEvt
=
0
;
lpdcb16
->
fBinary
=
1
;
lpdcb16
->
fDtrDisable
=
0
;
lpdcb16
->
fDtrflow
=
(
lpdcb
->
fDtrControl
==
DTR_CONTROL_
ENABL
E
);
lpdcb16
->
fRtsflow
=
(
lpdcb
->
fRtsControl
==
RTS_CONTROL_
ENABL
E
);
lpdcb16
->
fDtrflow
=
(
lpdcb
->
fDtrControl
==
DTR_CONTROL_
HANDSHAK
E
);
lpdcb16
->
fRtsflow
=
(
lpdcb
->
fRtsControl
==
RTS_CONTROL_
HANDSHAK
E
);
lpdcb16
->
fOutxCtsFlow
=
lpdcb
->
fOutxCtsFlow
;
lpdcb16
->
fOutxDsrFlow
=
lpdcb
->
fOutxDsrFlow
;
lpdcb16
->
fDtrDisable
=
(
lpdcb
->
fDtrControl
==
DTR_CONTROL_DISABLE
);
...
...
@@ -1096,7 +1095,7 @@ INT16 WINAPI ReadComm16(INT16 cid,LPSTR lpvBuf,INT16 cbRead)
length
+=
status
;
}
TRACE
(
"%
.*
s
\n
"
,
length
,
orgBuf
);
TRACE
(
"%s
\n
"
,
debugstr_an
(
orgBuf
,
length
)
);
ptr
->
commerror
=
0
;
return
length
;
}
...
...
@@ -1121,7 +1120,7 @@ INT16 WINAPI WriteComm16(INT16 cid, LPSTR lpvBuf, INT16 cbWrite)
return
-
1
;
}
TRACE
(
"%
.*
s
\n
"
,
cbWrite
,
lpvBuf
);
TRACE
(
"%s
\n
"
,
debugstr_an
(
lpvBuf
,
cbWrite
)
);
length
=
0
;
while
(
length
<
cbWrite
)
{
...
...
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