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
7b7f35ae
Commit
7b7f35ae
authored
Apr 02, 2009
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel32: Use __wine_main_environ by default, environ is broken on FreeBSD too.
parent
f41b2396
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
process.c
dlls/kernel32/process.c
+5
-4
No files found.
dlls/kernel32/process.c
View file @
7b7f35ae
...
...
@@ -58,9 +58,9 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
#ifdef __APPLE__
extern
char
**
__wine_get_main_environment
(
void
);
#define environ __wine_get_main_environment()
#else
extern
char
**
environ
;
extern
char
**
__wine_main_environ
;
static
char
**
__wine_get_main_environment
(
void
)
{
return
__wine_main_environ
;
}
#endif
typedef
struct
...
...
@@ -280,9 +280,10 @@ static BOOL build_initial_environment(void)
char
**
e
;
WCHAR
*
p
,
*
endptr
;
void
*
ptr
;
char
**
env
=
__wine_get_main_environment
();
/* Compute the total size of the Unix environment */
for
(
e
=
env
iron
;
*
e
;
e
++
)
for
(
e
=
env
;
*
e
;
e
++
)
{
if
(
is_special_env_var
(
*
e
))
continue
;
size
+=
MultiByteToWideChar
(
CP_UNIXCP
,
0
,
*
e
,
-
1
,
NULL
,
0
);
...
...
@@ -299,7 +300,7 @@ static BOOL build_initial_environment(void)
endptr
=
p
+
size
/
sizeof
(
WCHAR
);
/* And fill it with the Unix environment */
for
(
e
=
env
iron
;
*
e
;
e
++
)
for
(
e
=
env
;
*
e
;
e
++
)
{
char
*
str
=
*
e
;
...
...
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