Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Li Wenzhe
wine
Commits
adf8a0cb
Commit
adf8a0cb
authored
25 years ago
by
Marcus Meissner
Committed by
Alexandre Julliard
25 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Use @sysconfdir@ for the default registries in misc/registry.c too.
parent
e1f81a68
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
misc/Makefile.in
+2
-1
2 additions, 1 deletion
misc/Makefile.in
misc/registry.c
+4
-4
4 additions, 4 deletions
misc/registry.c
with
6 additions
and
5 deletions
misc/Makefile.in
+
2
−
1
View file @
adf8a0cb
DEFS
=
@DLLFLAGS@
-D__WINE__
sysconfdir
=
@sysconfdir@
DEFS
=
@DLLFLAGS@
-D__WINE__
-DETCDIR
=
"
\"
$(
sysconfdir
)
\"
"
TOPSRCDIR
=
@top_srcdir@
TOPOBJDIR
=
..
SRCDIR
=
@srcdir@
...
...
This diff is collapsed.
Click to expand it.
misc/registry.c
+
4
−
4
View file @
adf8a0cb
...
...
@@ -51,8 +51,8 @@ static void REGISTRY_Init(void);
/* NOTE: do not append a /. linux' mkdir() WILL FAIL if you do that */
#define WINE_PREFIX "/.wine"
#define SAVE_USERS_DEFAULT
"/usr/local/etc
/wine.userreg"
#define SAVE_LOCAL_MACHINE_DEFAULT
"/usr/local/etc
/wine.systemreg"
#define SAVE_USERS_DEFAULT
ETCDIR"
/wine.userreg"
#define SAVE_LOCAL_MACHINE_DEFAULT
ETCDIR"
/wine.systemreg"
/* relative in ~user/.wine/ : */
#define SAVE_CURRENT_USER "user.reg"
...
...
@@ -1883,12 +1883,12 @@ void SHELL_LoadRegistry( void )
_w95_loadreg
(
"user.dat"
,
HKU
);
/*
* Load the global HKU hive directly from
/usr/local/etc
* Load the global HKU hive directly from
sysconfdir
*/
_wine_loadreg
(
HKU
,
SAVE_USERS_DEFAULT
,
0
);
/*
* Load the global machine defaults directly form
/usr/local/etc
* Load the global machine defaults directly form
sysconfdir
*/
_wine_loadreg
(
HKLM
,
SAVE_LOCAL_MACHINE_DEFAULT
,
0
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment