Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
9af2bd48
Commit
9af2bd48
authored
Jun 14, 2004
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Yet another fix for the MacOS X environ brain damage.
parent
62a86098
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
library.h
include/wine/library.h
+1
-1
loader.c
libs/wine/loader.c
+9
-2
main.c
loader/main.c
+1
-2
No files found.
include/wine/library.h
View file @
9af2bd48
...
...
@@ -53,7 +53,7 @@ extern int __wine_main_argc;
extern
char
**
__wine_main_argv
;
extern
WCHAR
**
__wine_main_wargv
;
extern
char
**
__wine_main_environ
;
extern
void
wine_init
(
int
argc
,
char
*
argv
[],
char
*
e
nvp
[],
char
*
e
rror
,
int
error_size
);
extern
void
wine_init
(
int
argc
,
char
*
argv
[],
char
*
error
,
int
error_size
);
/* debugging */
...
...
libs/wine/loader.c
View file @
9af2bd48
...
...
@@ -41,6 +41,13 @@
#include "winbase.h"
#include "wine/library.h"
#ifdef __APPLE__
#include <crt_externs.h>
#define environ (*_NSGetEnviron())
#else
extern
char
**
environ
;
#endif
/* argc/argv for the Windows application */
int
__wine_main_argc
=
0
;
char
**
__wine_main_argv
=
NULL
;
...
...
@@ -504,7 +511,7 @@ static void debug_usage(void)
*
* Main Wine initialisation.
*/
void
wine_init
(
int
argc
,
char
*
argv
[],
char
*
e
nvp
[],
char
*
e
rror
,
int
error_size
)
void
wine_init
(
int
argc
,
char
*
argv
[],
char
*
error
,
int
error_size
)
{
char
*
wine_debug
;
int
file_exists
;
...
...
@@ -515,7 +522,7 @@ void wine_init( int argc, char *argv[], char *envp[], char *error, int error_siz
wine_init_argv0_path
(
argv
[
0
]
);
__wine_main_argc
=
argc
;
__wine_main_argv
=
argv
;
__wine_main_environ
=
env
p
;
__wine_main_environ
=
env
iron
;
mmap_init
();
if
((
wine_debug
=
getenv
(
"WINEDEBUG"
)))
...
...
loader/main.c
View file @
9af2bd48
...
...
@@ -33,7 +33,6 @@ int main( int argc, char *argv[] )
{
char
error
[
1024
];
int
i
;
extern
char
**
environ
;
if
(
wine_main_preload_info
)
{
...
...
@@ -42,7 +41,7 @@ int main( int argc, char *argv[] )
wine_main_preload_info
[
i
].
size
);
}
wine_init
(
argc
,
argv
,
e
nviron
,
e
rror
,
sizeof
(
error
)
);
wine_init
(
argc
,
argv
,
error
,
sizeof
(
error
)
);
fprintf
(
stderr
,
"wine: failed to initialize: %s
\n
"
,
error
);
exit
(
1
);
}
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