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

* devices.in (dev_cygdrive_storage): Revert mapping to \Device\Null.

Browse Source 
(dev_storage): Ditto for /dev.
	* devices.cc: Regenerate.
	* fhandler.cc (fhandler_base::open_null): New method to open a fake
	\Device\Null handler.
	(fhandler_base::open): Fix formatting.  Change O_ACCMODE test to a
	switch statement.  Simplify a test which still tested for a now unused
	create_disposition.
	* fhandler.h (fhandler_base::open_null): Declare.
	(fhandler_netdrive::close): Declare.
	* fhandler_dev.cc (fhandler_dev::open): Open fake \Device\Null handle
	by just calling new open_null method.
	* fhandler_disk_file.cc (fhandler_cygdrive::open): Ditto.
	* fhandler_netdrive.cc (fhandler_netdrive::open): Call open_null
	rather than setting nohandle.
	(fhandler_netdrive::close): New method.
	* fhandler_registry.cc (fetch_hkey): Fix token in RegOpenUserClassesRoot
	call.  Create valid key for HKEY_CURRENT_CONFIG by mapping to real key
	HKEY_LOCAL_MACHINE\System\CurrentControlSet\Hardware Profiles\Current.
	(fhandler_registry::open): Set nohandle only when using pseudo registry
	handle.
	* fhandler_virtual.cc (fhandler_virtual::opendir): Call open rather
	than just setting nohandle here.
	* fhandler_virtual::fstatvfs): Set ST_RDONLY fs flag.
	* globals.cc (ro_u_null): New readonly UNICODE_STRING for \Device\Null.
	* path.h (path_conv::set_path): Revert previous change caring for
	wide_path.
This commit is contained in:
Corinna Vinschen
2013-10-31 14:26:42 +00:00
parent a5f316d8cf
commit 5b312b4747
12 changed files with 138 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
winsup/cygwin/fhandler_registry.cc
View File

@@ -87,7 +87,7 @@ fetch_hkey (int idx) /* idx *must* be valid */
if (registry_keys[idx] == HKEY_CLASSES_ROOT)
{
if (RegOpenUserClassesRoot (cygheap->user.issetuid ()
? cygheap->user.imp_token () : hProcImpToken,
? cygheap->user.imp_token () : hProcToken,
0, KEY_READ, &key) == ERROR_SUCCESS)
return key;
}
@@ -96,6 +96,17 @@ fetch_hkey (int idx) /* idx *must* be valid */
if (RegOpenCurrentUser (KEY_READ, &key) == ERROR_SUCCESS)
return key;
}
else if (registry_keys[idx] == HKEY_CURRENT_CONFIG)
{
if (RegOpenKeyExW (HKEY_LOCAL_MACHINE,
L"System\\CurrentControlSet\\Hardware Profiles\\Current",
0, KEY_READ, &key) == ERROR_SUCCESS)
return key;
}
/* Unfortunately there's no way to generate a valid OS registry key for
the other root keys. HKEY_USERS and HKEY_LOCAL_MACHINE are file
handles internally, HKEY_PERFORMANCE_DATA is just a bad hack and
no registry key at all. */
return registry_keys[idx];
}
@@ -820,7 +831,8 @@ fhandler_registry::open (int flags, mode_t mode)
set_io_handle (fetch_hkey (i));
/* Marking as nohandle allows to call dup on pseudo registry
handles. */
nohandle (true);
if (get_handle () >= HKEY_CLASSES_ROOT)
nohandle (true);
flags |= O_DIROPEN;
goto success;
}