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
45ac1355
Commit
45ac1355
authored
Dec 01, 2020
by
Piotr Caban
Committed by
Alexandre Julliard
Dec 01, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Use _ARGMAX from public header.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
480e25a5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
file.c
dlls/msvcrt/file.c
+2
-2
msvcrt.h
dlls/msvcrt/msvcrt.h
+0
-1
printf.h
dlls/msvcrt/printf.h
+2
-2
wcs.c
dlls/msvcrt/wcs.c
+3
-3
No files found.
dlls/msvcrt/file.c
View file @
45ac1355
...
...
@@ -5108,7 +5108,7 @@ static int puts_clbk_file_w(void *file, int len, const wchar_t *str)
static
int
vfprintf_helper
(
DWORD
options
,
FILE
*
file
,
const
char
*
format
,
_locale_t
locale
,
__ms_va_list
valist
)
{
printf_arg
args_ctx
[
MSVCRT_
_ARGMAX
+
1
];
printf_arg
args_ctx
[
_ARGMAX
+
1
];
BOOL
tmp_buf
;
int
ret
;
...
...
@@ -5140,7 +5140,7 @@ static int vfprintf_helper(DWORD options, FILE* file, const char *format,
static
int
vfwprintf_helper
(
DWORD
options
,
FILE
*
file
,
const
wchar_t
*
format
,
_locale_t
locale
,
__ms_va_list
valist
)
{
printf_arg
args_ctx
[
MSVCRT_
_ARGMAX
+
1
];
printf_arg
args_ctx
[
_ARGMAX
+
1
];
BOOL
tmp_buf
;
int
ret
;
...
...
dlls/msvcrt/msvcrt.h
View file @
45ac1355
...
...
@@ -886,7 +886,6 @@ int fpnum_double(struct fpnum*, double*) DECLSPEC_HIDDEN;
#define MSVCRT_CHECK_PMT_ERR(x,err) ((x) || (MSVCRT_INVALID_PMT( 0, (err) ), FALSE))
#define MSVCRT_CHECK_PMT(x) MSVCRT_CHECK_PMT_ERR((x), EINVAL)
#define MSVCRT__ARGMAX 100
typedef
int
(
*
puts_clbk_a
)(
void
*
,
int
,
const
char
*
);
typedef
int
(
*
puts_clbk_w
)(
void
*
,
int
,
const
wchar_t
*
);
typedef
union
_printf_arg
...
...
dlls/msvcrt/printf.h
View file @
45ac1355
...
...
@@ -1225,7 +1225,7 @@ static printf_arg arg_clbk_type(void *ctx, int pos, int type, __ms_va_list *vali
}
else
args
[
0
].
get_int
|=
TYPE_CLBK_POSITIONAL
;
if
(
pos
<
1
||
pos
>
MSVCRT_
_ARGMAX
)
if
(
pos
<
1
||
pos
>
_ARGMAX
)
args
[
0
].
get_int
|=
TYPE_CLBK_ERROR_POS
;
else
if
(
args
[
pos
].
get_int
&&
args
[
pos
].
get_int
!=
type
)
args
[
0
].
get_int
|=
TYPE_CLBK_ERROR_TYPE
;
...
...
@@ -1252,7 +1252,7 @@ int FUNC_NAME(create_positional_ctx)(void *args_ctx, const APICHAR *format, __ms
if
(
args
[
0
].
get_int
!=
TYPE_CLBK_POSITIONAL
)
return
-
1
;
for
(
i
=
MSVCRT_
_ARGMAX
;
i
>
0
;
i
--
)
for
(
i
=
_ARGMAX
;
i
>
0
;
i
--
)
if
(
args
[
i
].
get_int
)
break
;
...
...
dlls/msvcrt/wcs.c
View file @
45ac1355
...
...
@@ -1159,7 +1159,7 @@ int CDECL MSVCRT__vscprintf_l(const char *format,
int
CDECL
MSVCRT__vscprintf_p_l
(
const
char
*
format
,
_locale_t
locale
,
__ms_va_list
args
)
{
printf_arg
args_ctx
[
MSVCRT_
_ARGMAX
+
1
];
printf_arg
args_ctx
[
_ARGMAX
+
1
];
struct
_str_ctx_a
puts_ctx
=
{
INT_MAX
,
NULL
};
int
ret
;
...
...
@@ -1337,7 +1337,7 @@ int CDECL MSVCRT_vswprintf_c(wchar_t *str, size_t len,
static
int
MSVCRT_vswprintf_p_l_opt
(
wchar_t
*
buffer
,
size_t
length
,
const
wchar_t
*
format
,
DWORD
options
,
_locale_t
locale
,
__ms_va_list
args
)
{
printf_arg
args_ctx
[
MSVCRT_
_ARGMAX
+
1
];
printf_arg
args_ctx
[
_ARGMAX
+
1
];
struct
_str_ctx_w
puts_ctx
=
{
length
,
buffer
};
int
ret
;
...
...
@@ -1716,7 +1716,7 @@ static int MSVCRT_vsprintf_p_l_opt(char *buffer, size_t length, const char *form
DWORD
options
,
_locale_t
locale
,
__ms_va_list
args
)
{
static
const
char
nullbyte
=
'\0'
;
printf_arg
args_ctx
[
MSVCRT_
_ARGMAX
+
1
];
printf_arg
args_ctx
[
_ARGMAX
+
1
];
struct
_str_ctx_a
puts_ctx
=
{
length
,
buffer
};
int
ret
;
...
...
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