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
0512829a
Commit
0512829a
authored
Mar 08, 2011
by
Nikolay Sivov
Committed by
Alexandre Julliard
Mar 09, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Add _get_output_format() and return default value.
parent
6194d301
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
38 additions
and
4 deletions
+38
-4
msvcr100.spec
dlls/msvcr100/msvcr100.spec
+1
-1
msvcr80.spec
dlls/msvcr80/msvcr80.spec
+1
-1
msvcr90.spec
dlls/msvcr90/msvcr90.spec
+1
-1
misc.c
dlls/msvcrt/misc.c
+9
-0
msvcrt.h
dlls/msvcrt/msvcrt.h
+3
-0
msvcrt.spec
dlls/msvcrt/msvcrt.spec
+1
-1
headers.c
dlls/msvcrt/tests/headers.c
+1
-0
printf.c
dlls/msvcrt/tests/printf.c
+17
-0
stdio.h
include/msvcrt/stdio.h
+4
-0
No files found.
dlls/msvcr100/msvcr100.spec
View file @
0512829a
...
...
@@ -684,7 +684,7 @@
@ cdecl _get_heap_handle() msvcrt._get_heap_handle
@ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler
@ cdecl _get_osfhandle(long) msvcrt._get_osfhandle
@
stub
_get_output_format
@
cdecl _get_output_format() msvcrt.
_get_output_format
@ stub _get_pgmptr
@ stub _get_printf_count_output
@ stub _get_purecall_handler
...
...
dlls/msvcr80/msvcr80.spec
View file @
0512829a
...
...
@@ -528,7 +528,7 @@
@ cdecl _get_osfhandle(long) msvcrt._get_osfhandle
@ cdecl _get_osplatform(ptr) msvcrt._get_osplatform
@ stub _get_osver
@
stub
_get_output_format
@
cdecl _get_output_format() msvcrt.
_get_output_format
@ stub _get_pgmptr
@ stub _get_printf_count_output
@ stub _get_purecall_handler
...
...
dlls/msvcr90/msvcr90.spec
View file @
0512829a
...
...
@@ -518,7 +518,7 @@
@ cdecl _get_heap_handle() msvcrt._get_heap_handle
@ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler
@ cdecl _get_osfhandle(long) msvcrt._get_osfhandle
@
stub
_get_output_format
@
cdecl _get_output_format() msvcrt.
_get_output_format
@ stub _get_pgmptr
@ stub _get_printf_count_output
@ stub _get_purecall_handler
...
...
dlls/msvcrt/misc.c
View file @
0512829a
...
...
@@ -253,3 +253,12 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size,
MSVCRT_mergesort
(
base
,
secondarr
,
size
,
compar
,
0
,
nmemb
-
1
,
context
);
MSVCRT_free
(
secondarr
);
}
/*********************************************************************
* _get_output_format (MSVCRT.@)
*
*/
unsigned
int
CDECL
_get_output_format
(
void
)
{
return
0
;
}
dlls/msvcrt/msvcrt.h
View file @
0512829a
...
...
@@ -769,6 +769,9 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int);
#define MSVCRT__WRITE_ABORT_MSG 1
#define MSVCRT__CALL_REPORTFAULT 2
/* _get_output_format return code */
#define MSVCRT__TWO_DIGIT_EXPONENT 0x1
void
__cdecl
MSVCRT_free
(
void
*
);
void
*
__cdecl
MSVCRT_malloc
(
MSVCRT_size_t
);
void
*
__cdecl
MSVCRT_calloc
(
MSVCRT_size_t
,
MSVCRT_size_t
);
...
...
dlls/msvcrt/msvcrt.spec
View file @
0512829a
...
...
@@ -473,7 +473,7 @@
@ cdecl _get_osfhandle(long)
@ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform
# stub _get_osver
# stub _get_output_format
@ cdecl _get_output_format()
# stub _get_pgmptr
@ cdecl _get_sbh_threshold()
# stub _get_wenviron
...
...
dlls/msvcrt/tests/headers.c
View file @
0512829a
...
...
@@ -457,6 +457,7 @@ static void test_defines(void)
CHECK_DEF
(
_UNDERFLOW
);
CHECK_DEF
(
_WRITE_ABORT_MSG
);
CHECK_DEF
(
_CALL_REPORTFAULT
);
CHECK_DEF
(
_TWO_DIGIT_EXPONENT
);
}
#endif
/* __WINE_USE_MSVCRT */
...
...
dlls/msvcrt/tests/printf.c
View file @
0512829a
...
...
@@ -43,6 +43,7 @@ static int (__cdecl *p__ecvt_s)(char *buffer, size_t length, double number,
int
ndigits
,
int
*
decpt
,
int
*
sign
);
static
int
(
__cdecl
*
p__fcvt_s
)(
char
*
buffer
,
size_t
length
,
double
number
,
int
ndigits
,
int
*
decpt
,
int
*
sign
);
static
unsigned
int
(
__cdecl
*
p__get_output_format
)(
void
);
static
void
init
(
void
)
{
...
...
@@ -53,6 +54,7 @@ static void init( void )
p__vsnwprintf_s
=
(
void
*
)
GetProcAddress
(
hmod
,
"_vsnwprintf_s"
);
p__ecvt_s
=
(
void
*
)
GetProcAddress
(
hmod
,
"_ecvt_s"
);
p__fcvt_s
=
(
void
*
)
GetProcAddress
(
hmod
,
"_fcvt_s"
);
p__get_output_format
=
(
void
*
)
GetProcAddress
(
hmod
,
"_get_output_format"
);
}
static
void
test_sprintf
(
void
)
...
...
@@ -1013,6 +1015,20 @@ static void test_vsnwprintf_s(void)
ok
(
!
wcscmp
(
out1
,
buffer
),
"buffer wrong, got=%s
\n
"
,
wine_dbgstr_w
(
buffer
));
}
static
void
test__get_output_format
(
void
)
{
unsigned
int
ret
;
if
(
!
p__get_output_format
)
{
win_skip
(
"_get_output_format not available
\n
"
);
return
;
}
ret
=
p__get_output_format
();
ok
(
ret
==
0
,
"got %d
\n
"
,
ret
);
}
START_TEST
(
printf
)
{
init
();
...
...
@@ -1026,4 +1042,5 @@ START_TEST(printf)
test_vscprintf
();
test_vscwprintf
();
test_vsnwprintf_s
();
test__get_output_format
();
}
include/msvcrt/stdio.h
View file @
0512829a
...
...
@@ -94,6 +94,9 @@ FILE* __cdecl __iob_func(void);
#define stdout (_iob+STDOUT_FILENO)
#define stderr (_iob+STDERR_FILENO)
/* return value for _get_output_format */
#define _TWO_DIGIT_EXPONENT 0x1
#ifndef _STDIO_DEFINED
#define _STDIO_DEFINED
int
__cdecl
_fcloseall
(
void
);
...
...
@@ -173,6 +176,7 @@ int __cdecl vprintf(const char*,__ms_va_list);
int
__cdecl
vprintf_s
(
const
char
*
,
__ms_va_list
);
int
__cdecl
vsprintf
(
char
*
,
const
char
*
,
__ms_va_list
);
int
__cdecl
vsprintf_s
(
char
*
,
size_t
,
const
char
*
,
__ms_va_list
);
unsigned
int
__cdecl
_get_output_format
(
void
);
#ifndef _WSTDIO_DEFINED
#define _WSTDIO_DEFINED
...
...
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