Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
engine
Manage
Activity
Members
Labels
Plan
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor 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
sip
engine
Commits
e4a52e5c
Commit
e4a52e5c
authored
5 years ago
by
D-AIRY
Browse files
Options
Downloads
Patches
Plain Diff
Handling console in more portable way
parent
e8af22f1
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!6
Version X.7.0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/core/sxcore.h
+32
-9
32 additions, 9 deletions
source/core/sxcore.h
source/xcommon/IXCore.h
+31
-9
31 additions, 9 deletions
source/xcommon/IXCore.h
with
63 additions
and
18 deletions
source/core/sxcore.h
+
32
−
9
View file @
e4a52e5c
...
...
@@ -484,22 +484,45 @@ class COutPtr
m_fOut
=
::
_fdopen
(
_dup
(
hOut
),
"a+"
);
::
setvbuf
(
m_fOut
,
NULL
,
_IONBF
,
0
);
m_fStdout
=
*
stdout
;
m_fStderr
=
*
stderr
;
*
stdout
=
*
m_fOut
;
*
stderr
=
*
m_fOut
;
#ifdef _MSC_VER
if
(
_fileno
(
stdout
)
<
0
)
{
char
szPipename
[
255
];
HANDLE
hPipe
=
NULL
;
{
sprintf
(
szPipename
,
"
\\\\
.
\\
pipe
\\
SkyXEngineConsoleStdout-%u-%u"
,
GetCurrentProcessId
(),
GetCurrentThreadId
());
hPipe
=
CreateNamedPipe
(
szPipename
,
PIPE_ACCESS_DUPLEX
,
PIPE_NOWAIT
|
PIPE_READMODE_BYTE
,
PIPE_UNLIMITED_INSTANCES
,
0
,
0
,
0
,
NULL
);
freopen
(
szPipename
,
"w"
,
stdout
);
_dup2
(
_fileno
(
m_fOut
),
_fileno
(
stdout
));
CloseHandle
(
hPipe
);
}
{
sprintf
(
szPipename
,
"
\\\\
.
\\
pipe
\\
SkyXEngineConsoleStderr-%u-%u"
,
GetCurrentProcessId
(),
GetCurrentThreadId
());
hPipe
=
CreateNamedPipe
(
szPipename
,
PIPE_ACCESS_DUPLEX
,
PIPE_NOWAIT
|
PIPE_READMODE_BYTE
,
PIPE_UNLIMITED_INSTANCES
,
0
,
0
,
0
,
NULL
);
freopen
(
szPipename
,
"w"
,
stderr
);
_dup2
(
_fileno
(
m_fOut
),
_fileno
(
stderr
));
CloseHandle
(
hPipe
);
}
}
else
{
#endif
_dup2
(
_fileno
(
m_fOut
),
_fileno
(
stdout
));
_dup2
(
_fileno
(
m_fOut
),
_fileno
(
stderr
));
#ifdef _MSC_VER
}
#endif
::
setvbuf
(
stdout
,
NULL
,
_IONBF
,
0
);
::
setvbuf
(
stderr
,
NULL
,
_IONBF
,
0
);
//close(hOut);
}
~
COutPtr
()
{
*
stdout
=
m_fStdout
;
*
stderr
=
m_fStderr
;
fclose
(
m_fOut
);
}
FILE
*
m_fOut
;
FILE
m_fStdout
;
FILE
m_fStderr
;
};
/*! Устанавливает поток вывода. Для работы консоли
...
...
This diff is collapsed.
Click to expand it.
source/xcommon/IXCore.h
+
31
−
9
View file @
e4a52e5c
...
...
@@ -69,22 +69,44 @@ class CCoreOutPtr
m_fOut
=
::
_fdopen
(
_dup
(
hOut
),
"a+"
);
::
setvbuf
(
m_fOut
,
NULL
,
_IONBF
,
0
);
m_fStdout
=
*
stdout
;
m_fStderr
=
*
stderr
;
*
stdout
=
*
m_fOut
;
*
stderr
=
*
m_fOut
;
#ifdef _MSC_VER
if
(
_fileno
(
stdout
)
<
0
)
{
char
szPipename
[
255
];
HANDLE
hPipe
=
NULL
;
{
sprintf
(
szPipename
,
"
\\\\
.
\\
pipe
\\
SkyXEngineConsoleStdout-%u-%u"
,
GetCurrentProcessId
(),
GetCurrentThreadId
());
hPipe
=
CreateNamedPipe
(
szPipename
,
PIPE_ACCESS_DUPLEX
,
PIPE_NOWAIT
|
PIPE_READMODE_BYTE
,
PIPE_UNLIMITED_INSTANCES
,
0
,
0
,
0
,
NULL
);
freopen
(
szPipename
,
"w"
,
stdout
);
_dup2
(
_fileno
(
m_fOut
),
_fileno
(
stdout
));
CloseHandle
(
hPipe
);
}
{
sprintf
(
szPipename
,
"
\\\\
.
\\
pipe
\\
SkyXEngineConsoleStderr-%u-%u"
,
GetCurrentProcessId
(),
GetCurrentThreadId
());
hPipe
=
CreateNamedPipe
(
szPipename
,
PIPE_ACCESS_DUPLEX
,
PIPE_NOWAIT
|
PIPE_READMODE_BYTE
,
PIPE_UNLIMITED_INSTANCES
,
0
,
0
,
0
,
NULL
);
freopen
(
szPipename
,
"w"
,
stderr
);
_dup2
(
_fileno
(
m_fOut
),
_fileno
(
stderr
));
CloseHandle
(
hPipe
);
}
}
else
{
#endif
_dup2
(
_fileno
(
m_fOut
),
_fileno
(
stdout
));
_dup2
(
_fileno
(
m_fOut
),
_fileno
(
stderr
));
#ifdef _MSC_VER
}
#endif
::
setvbuf
(
stdout
,
NULL
,
_IONBF
,
0
);
::
setvbuf
(
stderr
,
NULL
,
_IONBF
,
0
);
}
~
CCoreOutPtr
()
{
*
stdout
=
m_fStdout
;
*
stderr
=
m_fStderr
;
fclose
(
m_fOut
);
}
FILE
*
m_fOut
;
FILE
m_fStdout
;
FILE
m_fStderr
;
};
/*! Устанавливает поток вывода. Для работы консоли
...
...
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