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
5ab5e1c5
Commit
5ab5e1c5
authored
24 years ago
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix prototypes of MSVCRT___getmainargs and MSVCRT___wgetmainargs.
Protect MSVCRT__acmdln global variable from corruption.
parent
9f758cc5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/msvcrt/data.c
+16
-8
16 additions, 8 deletions
dlls/msvcrt/data.c
dlls/msvcrt/msvcrt.spec
+2
-2
2 additions, 2 deletions
dlls/msvcrt/msvcrt.spec
with
18 additions
and
10 deletions
dlls/msvcrt/data.c
+
16
−
8
View file @
5ab5e1c5
...
...
@@ -142,8 +142,13 @@ void MSVCRT_init_args(void)
int
xargc
,
end
,
last_arg
,
afterlastspace
;
DWORD
version
;
MSVCRT__acmdln
=
cmdline
=
MSVCRT__strdup
(
GetCommandLineA
()
);
MSVCRT__wcmdln
=
wcmdline
=
wstrdupa
(
cmdline
);
MSVCRT__acmdln
=
MSVCRT__strdup
(
GetCommandLineA
()
);
MSVCRT__wcmdln
=
wcmdline
=
wstrdupa
(
MSVCRT__acmdln
);
/* Make a copy of MSVCRT__acmdln to be able modify it.
We will free it at the end of processing. */
cmdline
=
MSVCRT__strdup
(
MSVCRT__acmdln
);
TRACE
(
"got '%s', wide = '%s'
\n
"
,
cmdline
,
debugstr_w
(
wcmdline
));
version
=
GetVersion
();
...
...
@@ -207,6 +212,9 @@ void MSVCRT_init_args(void)
MSVCRT___argv
=
xargv
;
MSVCRT___wargv
=
wxargv
;
/* Free a no more needed copy of the command line */
MSVCRT_free
(
cmdline
);
TRACE
(
"found %d arguments
\n
"
,
MSVCRT___argc
);
MSVCRT__environ
=
GetEnvironmentStringsA
();
MSVCRT___initenv
=
&
MSVCRT__environ
;
...
...
@@ -224,25 +232,25 @@ void MSVCRT_free_args(void)
/*********************************************************************
* __getmainargs (MSVCRT.@)
*/
char
**
__cdecl
MSVCRT___getmainargs
(
DWORD
*
argc
,
char
***
argv
,
char
**
environ
,
DWORD
flag
)
void
__cdecl
MSVCRT___getmainargs
(
int
*
argc
,
char
***
argv
,
char
**
environ
,
int
expand_wildcards
,
void
*
_startupinfo
)
{
TRACE
(
"(%p,%p,%p,%
l
d).
\n
"
,
argc
,
argv
,
environ
,
flag
);
TRACE
(
"(%p,%p,%p,%d
,%p
).
\n
"
,
argc
,
argv
,
environ
,
expand_wildcards
,
_startupinfo
);
*
argc
=
MSVCRT___argc
;
*
argv
=
MSVCRT___argv
;
*
environ
=
MSVCRT__environ
;
return
environ
;
}
/*********************************************************************
* __wgetmainargs (MSVCRT.@)
*/
WCHAR
**
__cdecl
MSVCRT___wgetmainargs
(
DWORD
*
argc
,
WCHAR
***
wargv
,
WCHAR
**
wenviron
,
DWORD
flag
)
void
__cdecl
MSVCRT___wgetmainargs
(
int
*
argc
,
WCHAR
***
wargv
,
WCHAR
**
wenviron
,
int
expand_wildcards
,
void
*
_startupinfo
)
{
TRACE
(
"(%p,%p,%p,%
l
d).
\n
"
,
argc
,
wargv
,
wenviron
,
flag
);
TRACE
(
"(%p,%p,%p,%d
,%p
).
\n
"
,
argc
,
wargv
,
wenviron
,
expand_wildcards
,
_startupinfo
);
*
argc
=
MSVCRT___argc
;
*
wargv
=
MSVCRT___wargv
;
*
wenviron
=
MSVCRT__wenviron
;
return
wenviron
;
}
/*********************************************************************
...
...
This diff is collapsed.
Click to expand it.
dlls/msvcrt/msvcrt.spec
+
2
−
2
View file @
5ab5e1c5
...
...
@@ -96,7 +96,7 @@ debug_channels (msvcrt)
@ cdecl __dllonexit(ptr ptr ptr) MSVCRT___dllonexit
@ cdecl __doserrno() MSVCRT___doserrno
@ stub __fpecode #()
@ cdecl __getmainargs(ptr ptr ptr long) MSVCRT___getmainargs
@ cdecl __getmainargs(ptr ptr ptr long
ptr
) MSVCRT___getmainargs
@ extern __initenv MSVCRT___initenv
@ cdecl __isascii(long) MSVCRT___isascii
@ cdecl __iscsym(long) MSVCRT___iscsym
...
...
@@ -147,7 +147,7 @@ debug_channels (msvcrt)
@ cdecl __unDNameEx() MSVCRT___unDNameEx #FIXME
@ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@ extern __wargv MSVCRT___wargv
@ cdecl __wgetmainargs(ptr ptr ptr long) MSVCRT___wgetmainargs
@ cdecl __wgetmainargs(ptr ptr ptr long
ptr
) MSVCRT___wgetmainargs
@ extern __winitenv MSVCRT___winitenv
@ cdecl _abnormal_termination() MSVCRT__abnormal_termination
@ cdecl _access(str long) MSVCRT__access
...
...
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