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

* registry.cc (reg_key::get_dword): Rename from get_int, use DWORD

Browse Source 
rather than int type.  Avoid compiler warning.
	(reg_key::set_dword): Rename from set_int, use DWORD rather than int
	type.  Change return type to NTSTATUS.
	(reg_key::get_string): Change return type to NTSTATUS.
	(reg_key::set_string): Ditto.
	* registry.h: Accommodate above changes.
	* environ.cc (regopt): Test return value of reg_key::get_string as
	NTSTATUS.
	* sched.cc (sched_rr_get_interval): Change local int vars to DWORD.
	Call reg_key::get_dword instead of reg_key::get_int.
	* shared.cc (init_installation_root): Test return value of
	reg_key::get_string as NTSTATUS.
	(shared_info::heap_slop_size): Call reg_key::get_dword rather than
	reg_key::get_int.
	(shared_info::heap_chunk_size): Ditto.
	* shared_info.h (CURR_SHARED_MAGIC): Update.
	(class shared_info): Change heap_chunk and heap_slop to DWORD  values.
This commit is contained in:
Corinna Vinschen 2011-04-23 13:15:46 +00:00
parent 8ba4144d50
commit cca89be9ad
7 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,24 @@
2011-04-23 Corinna Vinschen <corinna@vinschen.de>
* registry.cc (reg_key::get_dword): Rename from get_int, use DWORD
rather than int type. Avoid compiler warning.
(reg_key::set_dword): Rename from set_int, use DWORD rather than int
type. Change return type to NTSTATUS.
(reg_key::get_string): Change return type to NTSTATUS.
(reg_key::set_string): Ditto.
* registry.h: Accommodate above changes.
* environ.cc (regopt): Test return value of reg_key::get_string as
NTSTATUS.
* sched.cc (sched_rr_get_interval): Change local int vars to DWORD.
Call reg_key::get_dword instead of reg_key::get_int.
* shared.cc (init_installation_root): Test return value of
reg_key::get_string as NTSTATUS.
(shared_info::heap_slop_size): Call reg_key::get_dword rather than
reg_key::get_int.
(shared_info::heap_chunk_size): Ditto.
* shared_info.h (CURR_SHARED_MAGIC): Update.
(class shared_info): Change heap_chunk and heap_slop to DWORD values.
2011-04-21 Corinna Vinschen <corinna@vinschen.de> 2011-04-21 Corinna Vinschen <corinna@vinschen.de>
* cygtls.cc (_cygtls::init_thread): Drop setting locals.process_logmask. * cygtls.cc (_cygtls::init_thread): Drop setting locals.process_logmask.

3
winsup/cygwin/environ.cc
View File

@ -712,7 +712,8 @@ regopt (const WCHAR *name, char *buf)
{ {
reg_key r (i, KEY_READ, _WIDE (CYGWIN_INFO_PROGRAM_OPTIONS_NAME), NULL); reg_key r (i, KEY_READ, _WIDE (CYGWIN_INFO_PROGRAM_OPTIONS_NAME), NULL);
if (r.get_string (lname.Buffer, (PWCHAR) buf, NT_MAX_PATH, L"") == ERROR_SUCCESS) if (NT_SUCCESS (r.get_string (lname.Buffer, (PWCHAR) buf,
NT_MAX_PATH, L"")))
{ {
char *newp; char *newp;
sys_wcstombs_alloc(&newp, HEAP_NOTHEAP, (PWCHAR) buf); sys_wcstombs_alloc(&newp, HEAP_NOTHEAP, (PWCHAR) buf);

29
winsup/cygwin/registry.cc
View File

@ -121,11 +121,11 @@ reg_key::build_reg (HKEY top, REGSAM access, va_list av)
} }
} }
/* Given the current registry key, return the specific int value /* Given the current registry key, return the specific DWORD value
requested. Return def on failure. */ requested. Return def on failure. */
int DWORD
reg_key::get_int (PCWSTR name, int def) reg_key::get_dword (PCWSTR name, DWORD def)
{ {
if (key_is_invalid) if (key_is_invalid)
return def; return def;
@ -142,14 +142,14 @@ reg_key::get_int (PCWSTR name, int def)
size, &rsize); size, &rsize);
if (status != STATUS_SUCCESS || vbuf->Type != REG_DWORD) if (status != STATUS_SUCCESS || vbuf->Type != REG_DWORD)
return def; return def;
DWORD dst = *(DWORD *) vbuf->Data; DWORD *dst = (DWORD *) vbuf->Data;
return (int) dst; return *dst;
} }
/* Given the current registry key, set a specific int value. */ /* Given the current registry key, set a specific DWORD value. */
int NTSTATUS
reg_key::set_int (PCWSTR name, int val) reg_key::set_dword (PCWSTR name, DWORD val)
{ {
if (key_is_invalid) if (key_is_invalid)
return key_is_invalid; return key_is_invalid;
@ -157,15 +157,13 @@ reg_key::set_int (PCWSTR name, int val)
DWORD value = (DWORD) val; DWORD value = (DWORD) val;
UNICODE_STRING uname; UNICODE_STRING uname;
RtlInitUnicodeString (&uname, name); RtlInitUnicodeString (&uname, name);
NTSTATUS status = NtSetValueKey (key, &uname, 0, REG_DWORD, return NtSetValueKey (key, &uname, 0, REG_DWORD, &value, sizeof (value));
&value, sizeof (value));
return (int) status;
} }
/* Given the current registry key, return the specific string value /* Given the current registry key, return the specific string value
requested. Return zero on success, non-zero on failure. */ requested. Return zero on success, non-zero on failure. */
int NTSTATUS
reg_key::get_string (PCWSTR name, PWCHAR dst, size_t max, PCWSTR def) reg_key::get_string (PCWSTR name, PWCHAR dst, size_t max, PCWSTR def)
{ {
NTSTATUS status; NTSTATUS status;
@ -193,12 +191,12 @@ reg_key::get_string (PCWSTR name, PWCHAR dst, size_t max, PCWSTR def)
wcpncpy (dst, (PWCHAR) vbuf->Data, max); wcpncpy (dst, (PWCHAR) vbuf->Data, max);
} }
return (int) status; return status;
} }
/* Given the current registry key, set a specific string value. */ /* Given the current registry key, set a specific string value. */
int NTSTATUS
reg_key::set_string (PCWSTR name, PCWSTR src) reg_key::set_string (PCWSTR name, PCWSTR src)
{ {
if (key_is_invalid) if (key_is_invalid)
@ -206,9 +204,8 @@ reg_key::set_string (PCWSTR name, PCWSTR src)
UNICODE_STRING uname; UNICODE_STRING uname;
RtlInitUnicodeString (&uname, name); RtlInitUnicodeString (&uname, name);
NTSTATUS status = NtSetValueKey (key, &uname, 0, REG_SZ, (PVOID) src, return NtSetValueKey (key, &uname, 0, REG_SZ, (PVOID) src,
(wcslen (src) + 1) * sizeof (WCHAR)); (wcslen (src) + 1) * sizeof (WCHAR));
return (int) status;
} }
reg_key::~reg_key () reg_key::~reg_key ()

10
winsup/cygwin/registry.h
View File

@ -25,13 +25,13 @@ public:
void *operator new (size_t, void *p) {return p;} void *operator new (size_t, void *p) {return p;}
void build_reg (HKEY key, REGSAM access, va_list av); void build_reg (HKEY key, REGSAM access, va_list av);
int error () {return key == NULL;} bool error () {return key == NULL;}
int get_int (PCWSTR, int); DWORD get_dword (PCWSTR, DWORD);
int get_string (PCWSTR, PWCHAR, size_t, PCWSTR); NTSTATUS get_string (PCWSTR, PWCHAR, size_t, PCWSTR);
int set_int (PCWSTR, int); NTSTATUS set_dword (PCWSTR, DWORD);
int set_string (PCWSTR, PCWSTR); NTSTATUS set_string (PCWSTR, PCWSTR);
bool created () const {return _disposition & REG_CREATED_NEW_KEY;} bool created () const {return _disposition & REG_CREATED_NEW_KEY;}

4
winsup/cygwin/sched.cc
View File

@ -262,7 +262,7 @@ sched_rr_get_interval (pid_t pid, struct timespec *interval)
HWND forwin; HWND forwin;
DWORD forprocid; DWORD forprocid;
int vfindex, slindex, qindex, prisep; DWORD vfindex, slindex, qindex, prisep;
long nsec; long nsec;
forwin = GetForegroundWindow (); forwin = GetForegroundWindow ();
@ -278,7 +278,7 @@ sched_rr_get_interval (pid_t pid, struct timespec *interval)
set_errno (ESRCH); set_errno (ESRCH);
return -1; return -1;
} }
prisep = reg.get_int (L"Win32PrioritySeparation", 2); prisep = reg.get_dword (L"Win32PrioritySeparation", 2);
pinfo pi (pid ? pid : myself->pid); pinfo pi (pid ? pid : myself->pid);
if (!pi) if (!pi)
{ {

8
winsup/cygwin/shared.cc
View File

@ -111,8 +111,8 @@ init_installation_root ()
{ {
reg_key r (i, KEY_WRITE, _WIDE (CYGWIN_INFO_INSTALLATIONS_NAME), reg_key r (i, KEY_WRITE, _WIDE (CYGWIN_INFO_INSTALLATIONS_NAME),
NULL); NULL);
if (r.set_string (installation_key_buf, installation_root) if (NT_SUCCESS (r.set_string (installation_key_buf,
== ERROR_SUCCESS) installation_root)))
break; break;
} }
@ -450,7 +450,7 @@ shared_info::heap_slop_size ()
{ {
reg_key reg (i, KEY_READ, NULL); reg_key reg (i, KEY_READ, NULL);
if ((heap_slop = reg.get_int (L"heap_slop_in_mb", 0))) if ((heap_slop = reg.get_dword (L"heap_slop_in_mb", 0)))
break; break;
heap_slop = wincap.heapslop (); heap_slop = wincap.heapslop ();
} }
@ -476,7 +476,7 @@ shared_info::heap_chunk_size ()
/* FIXME: We should not be restricted to a fixed size heap no matter /* FIXME: We should not be restricted to a fixed size heap no matter
what the fixed size is. */ what the fixed size is. */
if ((heap_chunk = reg.get_int (L"heap_chunk_in_mb", 0))) if ((heap_chunk = reg.get_dword (L"heap_chunk_in_mb", 0)))
break; break;
heap_chunk = 384; /* Default */ heap_chunk = 384; /* Default */
} }

9
winsup/cygwin/shared_info.h
View File

@ -1,6 +1,7 @@
/* shared_info.h: shared info for cygwin /* shared_info.h: shared info for cygwin
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 Red Hat, Inc. Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009,
2010, 2011 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -29,7 +30,7 @@ public:
/* Data accessible to all tasks */ /* Data accessible to all tasks */
#define CURR_SHARED_MAGIC 0xcebb78fcU #define CURR_SHARED_MAGIC 0x7f4db5d3U
#define USER_VERSION 1 #define USER_VERSION 1
#define CURR_USER_MAGIC 0x6112afb3U #define CURR_USER_MAGIC 0x6112afb3U
@ -42,9 +43,9 @@ class shared_info
LONG version; LONG version;
DWORD cb; DWORD cb;
public: public:
unsigned heap_chunk; DWORD heap_chunk;
bool heap_slop_inited; bool heap_slop_inited;
unsigned heap_slop; DWORD heap_slop;
DWORD sys_mount_table_counter; DWORD sys_mount_table_counter;
tty_list tty; tty_list tty;
LONG last_used_bindresvport; LONG last_used_bindresvport;