* Makefile.in (DLL_IMPORTS): Drop advapi32.dll.
* autoload.cc: Enable autoloading advapi32 functions. * environ.cc (regopt): Use wide char arguments in reg_key functions. * fhandler_console.cc (beep): Ditto. Use WCHAR throughout. * registry.cc (reg_key): Rewrite reg_key class to use native NT registry functions. Use WCHAR string parameters throughout. Use PCWSTR rather than const WCHAR. Drop multibyte char functionality. Drop unused methods. (get_registry_hive_path): Use RtlQueryRegistryValues to fetch path from registry. (load_registry_hive): Drop useless check for user hive being available. Load hive using NtLoadKey. * registry.h: Accommodate above changes. * sched.cc (sched_rr_get_interval): Use wide char arguments in reg_key functions. * shared.cc (init_installation_root): Ditto. (shared_info::init_obcaseinsensitive): Use RtlQueryRegistryValues to fetch obcaseinsensitive value. (shared_info::heap_slop_size): Use wide char arguments in reg_key functions. (shared_info::heap_chunk_size): Ditto. * syscalls.cc (gethostid): Ditto. * winsup.h (__WIDE): Define. (_WIDE): Define. * libc/minires-os-if.c (get_registry_dns_items): Don't fetch values from registry. Just extract them from given UNICODE_STRING parameter. (get_registry_dns): Fetch all registry values at once using RtlQueryRegistryValues.
This commit is contained in:
@@ -61,16 +61,17 @@ dev_console NO_COPY *fhandler_console::dev_state;
|
||||
static void
|
||||
beep ()
|
||||
{
|
||||
reg_key r (HKEY_CURRENT_USER, KEY_ALL_ACCESS, "AppEvents", "Schemes", "Apps",
|
||||
".Default", ".Default", ".Current", NULL);
|
||||
const WCHAR ding[] = L"\\media\\ding.wav";
|
||||
reg_key r (HKEY_CURRENT_USER, KEY_ALL_ACCESS, L"AppEvents", L"Schemes",
|
||||
L"Apps", L".Default", L".Default", L".Current", NULL);
|
||||
if (r.created ())
|
||||
{
|
||||
char *buf = NULL;
|
||||
UINT len = GetWindowsDirectory (buf, 0);
|
||||
buf = (char *) alloca (len += sizeof ("\\media\\ding.wav"));
|
||||
UINT res = GetWindowsDirectory (buf, len);
|
||||
PWCHAR buf = NULL;
|
||||
UINT len = GetWindowsDirectoryW (buf, 0) * sizeof (WCHAR);
|
||||
buf = (PWCHAR) alloca (len += sizeof (ding));
|
||||
UINT res = GetWindowsDirectoryW (buf, len);
|
||||
if (res && res <= len)
|
||||
r.set_string ("", strcat (buf, "\\media\\ding.wav"));
|
||||
r.set_string (L"", wcscat (buf, ding));
|
||||
}
|
||||
MessageBeep (MB_OK);
|
||||
}
|
||||
|
Reference in New Issue
Block a user