JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_console.cc (fhandler_console::open_shared_console): Don't zero

Browse Source 
handle to open_shared since it is supposed to be an input.
(enum_windows): Set handle input to open_shared to NULL since it does not
represent any previously opened shared region.
* shared.cc (open_shared): Tweak debugging output.
This commit is contained in:
Christopher Faylor 2011-06-05 02:10:31 +00:00
parent 665f9a59a4
commit d5cb221b85
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2011-06-04 Christopher Faylor <me.cygwin2011@cgf.cx>
* fhandler_console.cc (fhandler_console::open_shared_console): Don't
zero handle to open_shared since it is supposed to be an input.
(enum_windows): Set handle input to open_shared to NULL since it does
not represent any previously opened shared region.
* shared.cc (open_shared): Tweak debugging output.
2011-06-03 Christopher Faylor <me.cygwin2011@cgf.cx> 2011-06-03 Christopher Faylor <me.cygwin2011@cgf.cx>
* ntdll.h (FILE_PIPE_*): Define constants. * ntdll.h (FILE_PIPE_*): Define constants.

3
winsup/cygwin/fhandler_console.cc
View File

@ -82,7 +82,6 @@ fhandler_console::open_shared_console (HWND hw, HANDLE& h, bool& create)
{ {
wchar_t namebuf[(sizeof "XXXXXXXXXXXXXXXXXX-consNNNNNNNNNN")]; wchar_t namebuf[(sizeof "XXXXXXXXXXXXXXXXXX-consNNNNNNNNNN")];
__small_swprintf (namebuf, L"%S-cons%p", &installation_key, hw); __small_swprintf (namebuf, L"%S-cons%p", &installation_key, hw);
h = NULL;
shared_locations m = create ? SH_JUSTCREATE: SH_JUSTOPEN; shared_locations m = create ? SH_JUSTCREATE: SH_JUSTOPEN;
console_state *res = (console_state *) console_state *res = (console_state *)
@ -108,7 +107,7 @@ enum_windows (HWND hw, LPARAM lp)
console_unit *this1 = (console_unit *) lp; console_unit *this1 = (console_unit *) lp;
if (hw == this1->me) if (hw == this1->me)
return TRUE; return TRUE;
HANDLE h; HANDLE h = NULL;
fhandler_console::console_state *cs; fhandler_console::console_state *cs;
if ((cs = fhandler_console::open_shared_console (hw, h))) if ((cs = fhandler_console::open_shared_console (hw, h)))
{ {

2
winsup/cygwin/shared.cc
View File

@ -301,7 +301,7 @@ open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size,
offsets[SH_TOTAL_SIZE] += delta; offsets[SH_TOTAL_SIZE] += delta;
} }
debug_printf ("name %W, n %d, shared %p (wanted %p), h %p", mapname, n, shared, addr, shared_h); debug_printf ("name %W, n %d, shared %p (wanted %p), h %p, *m %d", mapname, n, shared, addr, shared_h, *m);
return shared; return shared;
} }