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
Johnny Cai
wine
Commits
bbc2b5b9
Commit
bbc2b5b9
authored
22 years ago
by
Raul Dias
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Added new "GlobalRegistryDir" option.
parent
3e2217ca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
documentation/registry.sgml
+9
-0
9 additions, 0 deletions
documentation/registry.sgml
documentation/samples/config
+2
-0
2 additions, 0 deletions
documentation/samples/config
misc/registry.c
+23
-5
23 additions, 5 deletions
misc/registry.c
with
34 additions
and
5 deletions
documentation/registry.sgml
+
9
−
0
View file @
bbc2b5b9
...
...
@@ -256,6 +256,15 @@ ln -sf /usr/local/etc/wine.userreg wine.userreg
</para>
<variablelist>
<varlistentry>
<term>GlobalRegistryDir</term>
<listitem>
<para>
Optional. Sets the path to look for the Global
Registry.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>LoadGlobalRegistryFiles</term>
<listitem>
...
...
This diff is collapsed.
Click to expand it.
documentation/samples/config
+
2
−
0
View file @
bbc2b5b9
...
...
@@ -220,6 +220,8 @@ WINE REGISTRY Version 2
[registry]
;These are all booleans. Y/y/T/t/1 are true, N/n/F/f/0 are false.
;Defaults are read all, write to Home
; Where to find the global registries
;"GlobalRegistryDir" = "/etc";
; Global registries (stored in /etc)
"LoadGlobalRegistryFiles" = "Y"
; Home registries (stored in ~user/.wine/)
...
...
This diff is collapsed.
Click to expand it.
misc/registry.c
+
23
−
5
View file @
bbc2b5b9
...
...
@@ -64,9 +64,8 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
reg
);
/* FIXME: following defines should be configured global */
#define SAVE_GLOBAL_REGBRANCH_USER_DEFAULT ETCDIR"/wine.userreg"
#define SAVE_GLOBAL_REGBRANCH_LOCAL_MACHINE ETCDIR"/wine.systemreg"
#define SAVE_GLOBAL_REGBRANCH_USER_DEFAULT "/wine.userreg"
#define SAVE_GLOBAL_REGBRANCH_LOCAL_MACHINE "/wine.systemreg"
/* relative in ~user/.wine/ : */
#define SAVE_LOCAL_REGBRANCH_CURRENT_USER "user.reg"
...
...
@@ -1651,13 +1650,32 @@ static void _load_windows_registry( HKEY hkey_local_machine, HKEY hkey_current_u
/* load global registry files (stored in /etc/wine) [Internal] */
static
void
_load_global_registry
(
HKEY
hkey_local_machine
,
HKEY
hkey_users
)
{
WCHAR
Wglobalregistrydir
[
MAX_PATHNAME_LEN
];
char
globalregistrydir
[
MAX_PATHNAME_LEN
];
char
configfile
[
MAX_PATHNAME_LEN
];
static
const
WCHAR
registryW
[]
=
{
'r'
,
'e'
,
'g'
,
'i'
,
's'
,
't'
,
'r'
,
'y'
,
0
};
static
const
WCHAR
GlobalRegistryDirW
[]
=
{
'G'
,
'l'
,
'o'
,
'b'
,
'a'
,
'l'
,
'R'
,
'e'
,
'g'
,
'i'
,
's'
,
't'
,
'r'
,
'y'
,
'D'
,
'i'
,
'r'
,
0
};
static
const
WCHAR
empty_strW
[]
=
{
0
};
TRACE
(
"(void)
\n
"
);
/* Override ETCDIR? */
PROFILE_GetWineIniString
(
registryW
,
GlobalRegistryDirW
,
empty_strW
,
Wglobalregistrydir
,
MAX_PATHNAME_LEN
);
WideCharToMultiByte
(
CP_ACP
,
0
,
Wglobalregistrydir
,
-
1
,
globalregistrydir
,
MAX_PATHNAME_LEN
,
NULL
,
NULL
);
if
(
globalregistrydir
[
0
]
!=
'/'
)
strcpy
(
globalregistrydir
,
ETCDIR
);
TRACE
(
"GlobalRegistryDir is '%s'.
\n
"
,
globalregistrydir
);
/* Load the global HKU hive directly from sysconfdir */
load_wine_registry
(
hkey_users
,
SAVE_GLOBAL_REGBRANCH_USER_DEFAULT
);
strcpy
(
configfile
,
globalregistrydir
);
strcat
(
configfile
,
SAVE_GLOBAL_REGBRANCH_USER_DEFAULT
);
load_wine_registry
(
hkey_users
,
configfile
);
/* Load the global machine defaults directly from sysconfdir */
load_wine_registry
(
hkey_local_machine
,
SAVE_GLOBAL_REGBRANCH_LOCAL_MACHINE
);
strcpy
(
configfile
,
globalregistrydir
);
strcat
(
configfile
,
SAVE_GLOBAL_REGBRANCH_LOCAL_MACHINE
);
load_wine_registry
(
hkey_local_machine
,
configfile
);
}
/* load home registry files (stored in ~/.wine) [Internal] */
...
...
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