Commit Graph

303 Commits

Author SHA1 Message Date
Ryan Prichard
7b7192e441 Add version tracking. Add a --version arg to console and winpty-agent.
There is a "version suffix" that defaults to "-dev".  A maintainer could
change the suffix (or remove it) by invoking make:

    make BUILD_SUFFIX=-foo
    make BUILD_SUFFIX=

It can also be changed in gyp builds:

    gyp winpty.gyp --depth=1 -D BUILD_SUFFIX=-foo
    gyp winpty.gyp --depth=1 -D BUILD_SUFFIX=

If git cannot be executed, the string "none" is used for the commit hash.
2015-11-07 21:19:03 -06:00
Ryan Prichard
52b11bfba9 Convert the makefiles from recursive to non-recursive
* This change reduces the total build time from about 14 seconds to about
   9 seconds on my computer.

Also:

 * Consolidate all the intermediate files into the build directory to
   reduces clutter.

 * Allow specifying UNIX_ADAPTER_EXE to make.  Perhaps this will be helpful
   to the MSYS2 fork, which renames console.exe to winpty.exe.  (I like
   the renaming, but I don't know about the other winpty users.  Maybe
   I'll make the change after I've put out another stable release...)

 * Rename the WINPTY define to COMPILING_WINPTY_DLL define.  The longer
   name is clearer.  I define the macro inside libwinpty/winpty.cc, so the
   build system no longer needs to.  (I removed the define from
   winpty.gyp.)

 * Consolidate config-unix.mk and config-mingw.mk into config.mk.  The
   separation was previously necessary because each file had a conflicting
   definition of CXX.

 * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC,
   because libstdc++ isn't the only thing I'm linking statically.
2015-11-06 22:08:24 -06:00
Ryan Prichard
70eafd08d3 Avoid a potentially invalid LargeConsoleRead line.
I think it might be possible for m_dirtyLineCount to be greater than the
windowRect.top() + windowRect.height().  If it is, then scanForDirtyLines
will perform an invalid read while trying to initialize prevLineAttr.
2015-11-06 02:25:08 -06:00
Ryan Prichard
24dd41bb79 Improve error reporting for an invalid LargeConsoleRead line. 2015-11-06 02:21:36 -06:00
Ryan Prichard
ce2d9f1b04 Use Mark instead of SelectAll in the Windows 10 non-legacy console mode
Fixes https://github.com/rprichard/winpty/issues/53
2015-11-06 01:41:43 -06:00
Ryan Prichard
5fb236d70e Improve the SelectAllTest a little 2015-11-06 01:00:26 -06:00
Ryan Prichard
2e24ecdcd2 Remove TestHandleInheritance, which is obsoleted by HandleTests. 2015-11-06 00:44:21 -06:00
Ryan Prichard
0d4c175037 Expand the modern console I/O tests 2015-11-06 00:30:35 -06:00
Ryan Prichard
d3198232ce Also verify that Detached->Detached CreateProcess sets NULL stdhandles. 2015-11-05 02:15:11 -06:00
Ryan Prichard
303ddb9b4a Update the gyp file to account for recent file renamings and refactoring.
Also add agent/EventLoop.h.  I don't know why it wasn't listed.

With these changes, gyp no longer complains about missing files.
Unfortunately I can't do more testing at the moment.

This commit might fix issue https://github.com/rprichard/winpty/issues/55.
2015-11-02 16:44:24 -08:00
Ryan Prichard
fb0940b6da Add intro material to document 2015-10-27 13:34:42 -05:00
Ryan Prichard
18941a60c2 Update duplication tests for WOW64, XP inheritability bug 2015-10-27 13:34:42 -05:00
Ryan Prichard
c9a5f624be misc/buffer-tests: Add test failure reporting 2015-10-27 13:23:18 -05:00
Ryan Prichard
7c12d90086 Get the tests running inside the WOW64 environment on pre-Win7 OSs
Prior to Windows 7, the undocumented NtQuerySystemInformation API did
not return valid handle information when called by a WOW64 process.  To
work around this problem, the 32-bit test program connects to a 64-bit
worker and uses the existing RPC mechanism, issuing LookupKernelObject
commands, which call NtQuerySystemInformation in a native 64-bit
environment.

Even on Windows 7, the NtQuerySystemInformation API returns truncated
kernel object pointers, so, AFAIK, we still need to do this work. Maybe
not, though, if the lower 32 bits are guaranteed to be unique.

On Windows 10, there is a CompareObjectHandles API that works in WOW64
mode.
2015-10-27 13:19:42 -05:00
Ryan Prichard
72c5ea52fd Fixes and comments to Test_CreateProcess_Duplicate_PseudoHandleBug
It seems that this bug was fixed in WOW64 prior to its fixing in the
normal environment.

It makes no sense to run Test_CreateProcess_Duplicate_PseudoHandleBug_IL
on OS's that don't have inherit lists.
2015-10-26 18:42:06 -05:00
Ryan Prichard
b95da0a6d8 Document my theory for the CONOUT$ Win7 bug and add a safe-ish? testcase. 2015-10-26 17:39:04 -05:00
Ryan Prichard
116f3402ba Make the Windows 7 note a bit clearer. 2015-10-26 13:09:08 -05:00
Ryan Prichard
a7feca65a7 Consolidate InheritList tests, expand them, document the semantics.
Provide a way to test for UpdateProcThreadAttribute failures, because
trying to create an empty inherit list seems interesting to me.
2015-10-26 11:53:39 -05:00
Ryan Prichard
29b9ebbc2e Add Test_AttachConsole_AllocConsole_StdHandles trad + modern tests. 2015-10-26 01:14:23 -05:00
Ryan Prichard
4a67a2073e Suppress tests; XP doesn't have inherit lists 2015-10-25 23:38:51 -05:00
Ryan Prichard
37b467c2c5 Test with both CREATE_NEW_CONSOLE and CREATE_NO_WINDOW as the default.
Also fix a problem with a 0xdeadbeef handle.
2015-10-25 23:28:34 -05:00
Ryan Prichard
6f77ca472d CreateProcess can duplicate standard handles in another instance 2015-10-25 23:18:03 -05:00
Ryan Prichard
649bdad6e2 Documentation updates 2015-10-25 20:54:50 -05:00
Ryan Prichard
ff5be78af6 Rename the "default inheritance" concept to "duplicate". 2015-10-25 20:36:01 -05:00
Ryan Prichard
0b2e0c20ee Document DETACHED_PROCESS behavior and add a test for it. 2015-10-25 20:30:21 -05:00
Ryan Prichard
45a38be9e4 Add a simple test for the CreateProcess NewConsole standard handle case.
Simplify checkModernConsoleHandleInit usage; it isn't necessary to build
a list of potential console handles.  We can just scan for them.
2015-10-25 19:50:57 -05:00
Ryan Prichard
7ad3f28f48 Rewording in console-handles.md. 2015-10-25 19:35:30 -05:00
Ryan Prichard
ae8a725170 Refactor Test_CreateProcess_UseStdHandles to better follow spec. 2015-10-25 19:15:46 -05:00
Ryan Prichard
4b76f1e3a7 Rework standard handle setting in CreateProcess documentation.
I don't *think* this changes the semantics at all.

Also, move the INVALID_HANDLE_VALUE thing into a note at the bottom.

Improve intra-document bug linking.
2015-10-25 18:56:22 -05:00
Ryan Prichard
955b5c61c3 Fix CreateProcess_UseStdHandles on Win8 and fix the spec.
* The NULL-to-new-handle conversion only happens when creating a new
   console, not when attaching to the parent's console.

 * Also, Windows reports that the handle value 0x7 is value, presumably
   because it ignores the lowest 2 bits.  It's better to just remove those
   values from this test.
2015-10-25 17:37:06 -05:00
Ryan Prichard
9260d0b54e If Test_CreateProcess_DefaultInherit fails, don't ASSERT-fail. 2015-10-25 16:56:45 -05:00
Ryan Prichard
f4a3bd1743 Fill out CreateProcess UseStdHandles testing.
There's just one test, and it iterates over these combinations:
 - CreationConsoleMode=NewConsole and CreationConsoleMode=Inherit
 - bInheritHandles=FALSE and bInheritHandles=TRUE

It takes several seconds to run, but that's OK.
2015-10-25 16:56:38 -05:00
Ryan Prichard
8ed8bac96b Add tests for CreateProcess UseStdHandles !InheritHandles 2015-10-25 14:14:28 -05:00
Ryan Prichard
5dc88b1a3e Refactor scanForConsoleHandles
* Fix a compiler warning about uint->HANDLE conversion on x64.

 * Use isModernConio
2015-10-25 12:04:31 -05:00
Ryan Prichard
28f11b7f9b Speed handle object comparison by reducing NtQuerySystemInformation calls 2015-10-25 11:51:28 -05:00
Ryan Prichard
ac238429fc Speed up compareObjectHandles by about 2x on pre-Windows10 2015-10-25 10:39:07 -05:00
Ryan Prichard
0483e2f870 Split off Test_CreateProcess_DefaultInherit_PseudoHandleBug 2015-10-25 02:35:04 -05:00
Ryan Prichard
11cccfa4ae Split off two CreateProcess tests.
* Add CreateProcess_DefaultInherit

 * Add CreateProcess_DefaultInherit_XPPipeBug
2015-10-25 02:09:59 -05:00
Ryan Prichard
a17fac4e5a Switch to individual test registration. 2015-10-25 01:45:24 -05:00
Ryan Prichard
7bdbce5e2c Reorganize the handle tests. 2015-10-25 01:30:32 -05:00
Ryan Prichard
84e6822635 Rename SpecialInherit to DefaultInherit and add another test case
* Improve documentation for default inheritance mode, esp. w.r.t.
   console handles.
2015-10-25 00:28:58 -05:00
Ryan Prichard
7dd8e67ea9 Split common CreateProcess tests into a separate file. 2015-10-24 23:34:50 -05:00
Ryan Prichard
7c5c22c007 Clarifications to console-handles.md. 2015-10-24 05:17:50 -05:00
Ryan Prichard
1c88b71ec0 For the XP bug, also demonstrate that the write end of the pipe works. 2015-10-24 04:21:09 -05:00
Ryan Prichard
5917ff60a7 On Win10, replace NtQuerySystemInformation with CompareObjectHandles
* CompareObjectHandles is a documented API, and presumably it could be
   faster.  The tests actually do run a little faster now on Win10,
   dropping from 6.5sec to 3.6sec or so.

 * Also make the NtQuerySystemInformation buffer static so we don't have to
   repeat the double-buffer-in-a-loop process on every ntHandlePointer
   call.
2015-10-24 04:14:25 -05:00
Ryan Prichard
9b4155eccc Add a test for what seems to be an obscure Windows XP bug.
* The read end of a pipe is translated to NULL by the special
   bInheritHandles=FALSE, no-STARTF_USESTDHANDLES inheritance mode.  The
   write end of the pipe works fine.

 * Passing bInheritHandles=TRUE with an inheritable pipe handle fixes it.
   Adding STARTF_USESTDHANDLES to this also works.
2015-10-24 04:06:46 -05:00
Ryan Prichard
51e84a50d4 Reword a comment. 2015-10-24 02:34:00 -05:00
Ryan Prichard
f635afacaf Windows 8.1 fixed the INVALID_HANDLE_VALUE --> process handle bug.
* To version detect 8.1, we need GetVersionEx to return something greater
   than Windows 8, which requires creating an app manifest.  For now at
   least, put the manifest XML next to the EXE.  It can be built into the
   EXE, but this is good enough (at least for now).
2015-10-24 02:31:46 -05:00
Ryan Prichard
18f23f38c0 Checkpoint work on traditional and common tests.
* Add Test_CreateProcess_SpecialInherit

 * Add traditional Test_HandleDuplication

 * Make handle.dup() use a GetCurrentProcess() target while
   handle.dup(handle.worker()) uses a non-pseudo handle.
2015-10-24 01:58:16 -05:00
Ryan Prichard
7de7c6f76b Clarify document a bit. 2015-10-23 23:41:24 -05:00