Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ebe98f49
Commit
ebe98f49
authored
Mar 12, 2006
by
Jason Rumney
Browse files
(add_registry): Don't change the registry unless keys
already exist from a previous version.
parent
92cc46af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
nt/ChangeLog
nt/ChangeLog
+3
-0
nt/addpm.c
nt/addpm.c
+11
-7
No files found.
nt/ChangeLog
View file @
ebe98f49
2006-03-12 Jason Rumney <jasonr@gnu.org>
* addpm.c (add_registry): Don't change the registry unless keys
already exist from a previous version.
* makefile.w32-in (install): Use -q when invoking addpm.
* addpm.c (main): Accept -q as alternative for /q.
...
...
nt/addpm.c
View file @
ebe98f49
...
...
@@ -71,19 +71,23 @@ add_registry (path)
char
*
path
;
{
HKEY
hrootkey
=
NULL
;
DWORD
dwDisp
;
int
i
;
BOOL
ok
=
TRUE
;
/* Previous versions relied on registry settings, but we do not need
them any more. If registry settings are installed from a previous
version, replace them to ensure they are the current settings.
Otherwise, do nothing. */
/* Check both the current user and the local machine to see if we
have any resources. */
if
(
Reg
Create
KeyEx
(
HKEY_LOCAL_MACHINE
,
REG_ROOT
,
0
,
""
,
REG_OPTION_NON_VOLATILE
,
KEY_WRITE
,
NULL
,
&
hrootkey
,
&
dwDisp
)
!=
ERROR_SUCCESS
&&
Reg
Create
KeyEx
(
HKEY_CURRENT_USER
,
REG_ROOT
,
0
,
""
,
REG_OPTION_NON_VOLATILE
,
KEY_WRITE
,
NULL
,
&
hrootkey
,
&
dwDisp
)
!=
ERROR_SUCCESS
)
if
(
Reg
Open
KeyEx
(
HKEY_LOCAL_MACHINE
,
REG_ROOT
,
REG_OPTION_NON_VOLATILE
,
KEY_WRITE
,
&
hrootkey
)
!=
ERROR_SUCCESS
&&
Reg
Open
KeyEx
(
HKEY_CURRENT_USER
,
REG_ROOT
,
REG_OPTION_NON_VOLATILE
,
KEY_WRITE
,
&
hrootkey
)
!=
ERROR_SUCCESS
)
{
return
FALSE
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment