Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
ad1f09d5
Commit
ad1f09d5
authored
Jul 29, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wineconsole: Rename hSynchro to console.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
fef78c4e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
winecon_private.h
programs/wineconsole/winecon_private.h
+1
-1
wineconsole.c
programs/wineconsole/wineconsole.c
+6
-6
No files found.
programs/wineconsole/winecon_private.h
View file @
ad1f09d5
...
...
@@ -62,7 +62,7 @@ struct inner_data {
HANDLE
hConIn
;
/* console input handle */
HANDLE
hConOut
;
/* screen buffer handle: has to be changed when active sb changes */
HANDLE
hSynchro
;
/* waitable handle signalled by server when something in server has been modified
*/
HANDLE
console
;
/* console renderer handle
*/
HANDLE
hProcess
;
/* handle to the child process or NULL */
HWND
hWnd
;
/* handle of 'user' window or NULL for 'curses' */
INT
nCmdShow
;
/* argument of WinMain */
...
...
programs/wineconsole/wineconsole.c
View file @
ad1f09d5
...
...
@@ -203,7 +203,7 @@ void WINECON_GrabChanges(struct inner_data* data)
if
(
data
->
in_grab_changes
)
return
;
if
(
!
GetOverlappedResult
(
data
->
hSynchro
,
&
data
->
overlapped
,
&
num
,
FALSE
))
if
(
!
GetOverlappedResult
(
data
->
console
,
&
data
->
overlapped
,
&
num
,
FALSE
))
{
if
(
GetLastError
()
==
ERROR_IO_INCOMPLETE
)
return
;
ERR
(
"failed to get renderer events: %u
\n
"
,
GetLastError
()
);
...
...
@@ -355,7 +355,7 @@ void WINECON_GrabChanges(struct inner_data* data)
}
data
->
in_grab_changes
=
FALSE
;
if
(
!
DeviceIoControl
(
data
->
hSynchro
,
IOCTL_CONDRV_GET_RENDERER_EVENTS
,
NULL
,
0
,
data
->
events
,
if
(
!
DeviceIoControl
(
data
->
console
,
IOCTL_CONDRV_GET_RENDERER_EVENTS
,
NULL
,
0
,
data
->
events
,
sizeof
(
data
->
events
),
NULL
,
&
data
->
overlapped
)
&&
GetLastError
()
!=
ERROR_IO_PENDING
)
{
ERR
(
"failed to get renderer events: %u
\n
"
,
GetLastError
());
...
...
@@ -550,7 +550,7 @@ static void WINECON_Delete(struct inner_data* data)
if
(
data
->
fnDeleteBackend
)
data
->
fnDeleteBackend
(
data
);
if
(
data
->
hConIn
)
CloseHandle
(
data
->
hConIn
);
if
(
data
->
hConOut
)
CloseHandle
(
data
->
hConOut
);
if
(
data
->
hSynchro
)
CloseHandle
(
data
->
hSynchro
);
if
(
data
->
console
)
CloseHandle
(
data
->
console
);
if
(
data
->
hProcess
)
CloseHandle
(
data
->
hProcess
);
if
(
data
->
overlapped
.
hEvent
)
CloseHandle
(
data
->
overlapped
.
hEvent
);
HeapFree
(
GetProcessHeap
(),
0
,
data
->
curcfg
.
registry
);
...
...
@@ -664,17 +664,17 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna
}
SERVER_END_REQ
;
if
(
!
ret
)
goto
error
;
WINE_TRACE
(
"using hConIn %p, hSynchro event %p
\n
"
,
data
->
hConIn
,
data
->
hSynchro
);
WINE_TRACE
(
"using hConIn %p, hSynchro event %p
\n
"
,
data
->
hConIn
,
data
->
console
);
RtlInitUnicodeString
(
&
string
,
renderer_pathW
);
attr
.
ObjectName
=
&
string
;
status
=
NtCreateFile
(
&
data
->
hSynchro
,
FILE_READ_DATA
|
FILE_WRITE_DATA
|
FILE_WRITE_PROPERTIES
status
=
NtCreateFile
(
&
data
->
console
,
FILE_READ_DATA
|
FILE_WRITE_DATA
|
FILE_WRITE_PROPERTIES
|
FILE_READ_PROPERTIES
|
SYNCHRONIZE
,
&
attr
,
&
io
,
NULL
,
FILE_ATTRIBUTE_NORMAL
,
0
,
FILE_OPEN
,
FILE_NON_DIRECTORY_FILE
,
NULL
,
0
);
if
(
status
)
goto
error
;
h
=
condrv_handle
(
data
->
hConIn
);
if
(
!
DeviceIoControl
(
data
->
hSynchro
,
IOCTL_CONDRV_ATTACH_RENDERER
,
&
h
,
sizeof
(
h
),
NULL
,
0
,
NULL
,
NULL
))
if
(
!
DeviceIoControl
(
data
->
console
,
IOCTL_CONDRV_ATTACH_RENDERER
,
&
h
,
sizeof
(
h
),
NULL
,
0
,
NULL
,
NULL
))
goto
error
;
SERVER_START_REQ
(
create_console_output
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment