Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
3b5875e3
Commit
3b5875e3
authored
Apr 20, 2005
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace the wineprefixcreate --update option by a --wait option, and
make the non-wait behavior the default.
parent
3e2f2a52
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
23 deletions
+20
-23
server.c
dlls/ntdll/server.c
+5
-4
wineprefixcreate.in
tools/wineprefixcreate.in
+14
-18
winewrapper
tools/winewrapper
+1
-1
No files found.
dlls/ntdll/server.c
View file @
3b5875e3
...
...
@@ -742,13 +742,14 @@ static void create_config_dir(void)
}
if
(
!
pid
)
{
const
char
*
argv
[
5
];
const
char
*
argv
[
6
];
argv
[
0
]
=
"wineprefixcreate"
;
argv
[
1
]
=
"--quiet"
;
argv
[
2
]
=
"--prefix"
;
argv
[
3
]
=
tmp_dir
;
argv
[
4
]
=
NULL
;
argv
[
2
]
=
"--wait"
;
argv
[
3
]
=
"--prefix"
;
argv
[
4
]
=
tmp_dir
;
argv
[
5
]
=
NULL
;
wine_exec_wine_binary
(
argv
[
0
],
(
char
**
)
argv
,
NULL
,
FALSE
);
rmdir
(
tmp_dir
);
fatal_perror
(
"could not exec wineprefixcreate"
);
...
...
tools/wineprefixcreate.in
View file @
3b5875e3
...
...
@@ -29,8 +29,8 @@ usage()
echo
" -h, --help Display this message"
echo
" --prefix <dir> Directory to create (default:
\$
WINEPREFIX or ~/.wine)"
echo
" -q, --quiet Don't print status messages"
echo
" -u, --update Update the prefix directory if it already exists"
echo
" --use-wine-tree <dir> Run from the Wine source tree <dir>"
echo
" -w, --wait Wait for the wineserver to exit before returning"
echo
""
}
...
...
@@ -39,7 +39,7 @@ set -e
dlldir
=
"@dlldir@"
datadir
=
"@datadir@/wine"
do_
update
=
0
do_
wait
=
0
quiet
=
0
while
[
$#
-gt
0
]
...
...
@@ -53,14 +53,14 @@ do
WINEPREFIX
=
"
$2
"
shift
2
;;
-u
|
--update
)
do_update
=
1
shift
;;
-q
|
--quiet
)
quiet
=
1
shift
;;
-w
|
--wait
)
do_wait
=
1
shift
;;
--use-wine-tree
)
topdir
=
`
cd
"
$2
"
&&
pwd
`
if
[
-x
"
$topdir
/server/wineserver"
]
...
...
@@ -165,20 +165,16 @@ link_app winebrowser "$CROOT/windows/winebrowser.exe"
cp
"
$datadir
/wine.inf"
"
$CROOT
/windows/inf/wine.inf"
export
WINEPREFIX
${
WINELOADER
:-
wine
}
rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf
"
${
WINELOADER
:-
wine
}
"
rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf
# Wait for the wineserver to finish
if
[
$do_
update
=
0
]
if
[
$do_
wait
=
1
]
then
${
WINESERVER
:-
wineserver
}
-w
if
[
$quiet
=
0
]
then
echo
"
$WINEPREFIX
created successfully."
fi
else
if
[
$quiet
=
0
]
then
echo
"
$WINEPREFIX
updated successfully."
fi
"
${
WINESERVER
:-
wineserver
}
"
-w
fi
if
[
$quiet
=
0
]
then
echo
"
$WINEPREFIX
updated successfully."
fi
tools/winewrapper
View file @
3b5875e3
...
...
@@ -88,7 +88,7 @@ fi
if
[
-z
"
$WINEPREFIX
"
-a
!
-d
"
$HOME
/.wine"
]
then
"
$topdir
/tools/wineprefixcreate"
--u
pdate
--u
se-wine-tree
"
$topdir
"
"
$topdir
/tools/wineprefixcreate"
--use-wine-tree
"
$topdir
"
fi
# and run the application
...
...
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