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
58155d3e
Commit
58155d3e
authored
Nov 21, 2023
by
Eric Pouech
Committed by
Alexandre Julliard
Nov 21, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Fix ucrtbase environment initialization.
Signed-off-by:
Eric Pouech
<
epouech@codeweavers.com
>
parent
bdb624ff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
16 deletions
+19
-16
data.c
dlls/msvcrt/data.c
+19
-15
environ.c
dlls/ucrtbase/tests/environ.c
+0
-1
No files found.
dlls/msvcrt/data.c
View file @
58155d3e
...
...
@@ -593,14 +593,6 @@ void CDECL __set_app_type(int app_type)
#if _MSVCR_VER>=140
/*********************************************************************
* _get_initial_narrow_environment (UCRTBASE.@)
*/
char
**
CDECL
_get_initial_narrow_environment
(
void
)
{
return
MSVCRT___initenv
;
}
/*********************************************************************
* _configure_narrow_argv (UCRTBASE.@)
*/
int
CDECL
_configure_narrow_argv
(
int
mode
)
...
...
@@ -614,16 +606,18 @@ int CDECL _configure_narrow_argv(int mode)
*/
int
CDECL
_initialize_narrow_environment
(
void
)
{
TRACE
(
"
\n
"
);
return
0
;
TRACE
(
"
\n
"
);
return
env_init
(
FALSE
,
FALSE
)
;
}
/*********************************************************************
* _get_initial_
wide
_environment (UCRTBASE.@)
* _get_initial_
narrow
_environment (UCRTBASE.@)
*/
wchar_t
**
CDECL
_get_initial_wide
_environment
(
void
)
char
**
CDECL
_get_initial_narrow
_environment
(
void
)
{
return
MSVCRT___winitenv
;
TRACE
(
"
\n
"
);
_initialize_narrow_environment
();
return
MSVCRT___initenv
;
}
/*********************************************************************
...
...
@@ -640,8 +634,18 @@ int CDECL _configure_wide_argv(int mode)
*/
int
CDECL
_initialize_wide_environment
(
void
)
{
WARN
(
"stub
\n
"
);
return
0
;
TRACE
(
"
\n
"
);
return
env_init
(
TRUE
,
FALSE
);
}
/*********************************************************************
* _get_initial_wide_environment (UCRTBASE.@)
*/
wchar_t
**
CDECL
_get_initial_wide_environment
(
void
)
{
TRACE
(
"
\n
"
);
_initialize_wide_environment
();
return
MSVCRT___winitenv
;
}
/*********************************************************************
...
...
dlls/ucrtbase/tests/environ.c
View file @
58155d3e
...
...
@@ -136,7 +136,6 @@ static void test_initial_environ( void )
ok
(
p__p__wenviron
()
!=
NULL
,
"Unexpected NULL _wenviron[]
\n
"
);
ok
(
*
p__p__wenviron
()
==
NULL
,
"Unexpected non empty _wenviron[]
\n
"
);
todo_wine
ok
(
p_get_initial_wide_environment
()
!=
NULL
,
"Unexpected empty wide initial environment
\n
"
);
ok
(
p_get_initial_wide_environment
()
==
*
p__p__wenviron
(),
"Expecting _wenviron[] to match initial wide environment
\n
"
);
}
...
...
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