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

* shared.cc (shared_name): Take into account the SE_CREATE_GLOBAL_NAME

Browse Source 
privilege when building the name string.
	(open_shared): Remove the call to OpenFileMapping.
	(shared_info::initialize): Move cygheap initialization to ...
	(memory_init): ... here. Suppress now useless shared_h variable.
	(user_shared_initialize): Make tu a cygpsid.
This commit is contained in:
Corinna Vinschen 2003-12-01 11:16:20 +00:00
parent cb766c47bb
commit 4febe95f89
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
2003-12-01 Pierre Humblet <pierre.humblet@ieee.org>
* shared.cc (shared_name): Take into account the SE_CREATE_GLOBAL_NAME
privilege when building the name string.
(open_shared): Remove the call to OpenFileMapping.
(shared_info::initialize): Move cygheap initialization to ...
(memory_init): ... here. Suppress now useless shared_h variable.
(user_shared_initialize): Make tu a cygpsid.
2003-12-01 Dr. Volker Zell <Dr.Volker.Zell@oracle.com> 2003-12-01 Dr. Volker Zell <Dr.Volker.Zell@oracle.com>
* include/tzfile.h: Remove duplicate definition of TM_SUNDAY. * include/tzfile.h: Remove duplicate definition of TM_SUNDAY.

36
winsup/cygwin/shared.cc
View File

@ -35,9 +35,12 @@ char * __stdcall
shared_name (char *ret_buf, const char *str, int num) shared_name (char *ret_buf, const char *str, int num)
{ {
extern bool _cygwin_testing; extern bool _cygwin_testing;
static const char *prefix =
wincap.has_terminal_services ()
&& (set_process_privilege (SE_CREATE_GLOBAL_NAME, true) >= 0
|| GetLastError () == ERROR_NO_SUCH_PRIVILEGE) ? "Global\\" : "";
__small_sprintf (ret_buf, "%s%s.%s.%d", __small_sprintf (ret_buf, "%s%s.%s.%d", prefix,
wincap.has_terminal_services () ? "Global\\" : "",
cygwin_version.shared_id, str, num); cygwin_version.shared_id, str, num);
if (_cygwin_testing) if (_cygwin_testing)
strcat (ret_buf, cygwin_version.dll_build_date); strcat (ret_buf, cygwin_version.dll_build_date);
@ -91,15 +94,10 @@ open_shared (const char *name, int n, HANDLE &shared_h, DWORD size,
if (!name) if (!name)
mapname = NULL; mapname = NULL;
else else
{
mapname = shared_name (map_buf, name, n); mapname = shared_name (map_buf, name, n);
shared_h = OpenFileMappingA (FILE_MAP_READ | FILE_MAP_WRITE, if (!(shared_h = CreateFileMapping (INVALID_HANDLE_VALUE, psa,
TRUE, mapname);
}
if (!shared_h &&
!(shared_h = CreateFileMapping (INVALID_HANDLE_VALUE, psa,
PAGE_READWRITE, 0, size, mapname))) PAGE_READWRITE, 0, size, mapname)))
api_fatal ("CreateFileMapping, %E. Terminating."); api_fatal ("CreateFileMapping %s, %E. Terminating.", mapname);
} }
shared = (shared_info *) shared = (shared_info *)
@ -163,7 +161,7 @@ user_shared_initialize (bool reinit)
{ {
if (wincap.has_security ()) if (wincap.has_security ())
{ {
cygsid tu (cygheap->user.sid ()); cygpsid tu (cygheap->user.sid ());
tu.string (name); tu.string (name);
} }
else else
@ -216,13 +214,6 @@ shared_info::initialize ()
low_priority_sleep (0); // Should be hit only very very rarely low_priority_sleep (0); // Should be hit only very very rarely
} }
/* Initialize the Cygwin heap, if necessary */
if (!cygheap)
{
cygheap_init ();
cygheap->user.init ();
}
heap_init (); heap_init ();
if (!sversion) if (!sversion)
@ -238,16 +229,21 @@ memory_init ()
{ {
getpagesize (); getpagesize ();
/* Initialize the Cygwin heap, if necessary */
if (!cygheap)
{
cygheap_init ();
cygheap->user.init ();
}
/* Initialize general shared memory */ /* Initialize general shared memory */
HANDLE shared_h = cygheap ? cygheap->shared_h : NULL;
cygwin_shared = (shared_info *) open_shared ("shared", cygwin_shared = (shared_info *) open_shared ("shared",
CYGWIN_VERSION_SHARED_DATA, CYGWIN_VERSION_SHARED_DATA,
shared_h, cygheap->shared_h,
sizeof (*cygwin_shared), sizeof (*cygwin_shared),
SH_CYGWIN_SHARED); SH_CYGWIN_SHARED);
cygwin_shared->initialize (); cygwin_shared->initialize ();
cygheap->shared_h = shared_h;
ProtectHandleINH (cygheap->shared_h); ProtectHandleINH (cygheap->shared_h);
user_shared_initialize (false); user_shared_initialize (false);